commit 5be739c938a0a229ba9479b00b180e1f9c843e81
author Lei Zhang <thestig@chromium.org> Fri Jun 21 01:15:14 2013
committer ChromeBot <chrome-bot@google.com> Wed Jun 26 01:08:00 2013
tree 4582b50d419d21d8e1b1d11b53245c962dcf0d9b
parent 67d112437bd3918edca8aa4b02b3ef90e52f6a04

Add more temporary #ifdef to mtpd, so it can build with both libchrome-180609 and with Chromium r205050+.

BUG=none
TEST=emerge mtpd on ChromeOS, ninja -C out/Debug mtpd on Linux.

Change-Id: Ib6e6ec01e4e62042a3edf7e5d78affba7db43279
Reviewed-on: https://gerrit.chromium.org/gerrit/59508
Tested-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

device_manager.cc

diff --git a/device_manager.cc b/device_manager.cc
index 58a5699..fad93d2 100644
--- a/device_manager.cc
+++ b/device_manager.cc
@@ -12,21 +12,23 @@
 #include <base/logging.h>
 #include <base/memory/scoped_ptr.h>
 #include <base/stl_util.h>
-#include <base/stringprintf.h>
 
 #include "build_config.h"
 #include "device_event_delegate.h"
 #include "service_constants.h"
 
-// TODO(thestig) Merge these once libchrome catches up to Chromium's base.
+// TODO(thestig) Merge these once libchrome catches up to Chromium's base,
+// or when mtpd moves into its own repo. http://crbug.com/221123
 #if defined(CROS_BUILD)
 #include <base/file_path.h>
 #include <base/string_number_conversions.h>
 #include <base/string_split.h>
+#include <base/stringprintf.h>
 #else
 #include <base/files/file_path.h>
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/string_split.h>
+#include <base/strings/stringprintf.h>
 #endif
 
 namespace {

main.cc

diff --git a/main.cc b/main.cc
index 1ca1415..4690209 100644
--- a/main.cc
+++ b/main.cc
@@ -16,6 +16,7 @@
 #include <base/command_line.h>
 #include <base/logging.h>
 
+#include "build_config.h"
 #include "daemon.h"
 #include "service_constants.h"
 
@@ -23,7 +24,8 @@
 #include <chromeos/syslog_logging.h>
 #endif
 
-// TODO(thestig) Merge these once libchrome catches up to Chromium's base.
+// TODO(thestig) Merge these once libchrome catches up to Chromium's base,
+// or when mtpd moves into its own repo. http://crbug.com/221123
 #if defined(CROS_BUILD)
 #include <base/string_number_conversions.h>
 #else

mtpd_server_impl.cc

diff --git a/mtpd_server_impl.cc b/mtpd_server_impl.cc
index 325c217..068f195 100644
--- a/mtpd_server_impl.cc
+++ b/mtpd_server_impl.cc
@@ -8,9 +8,11 @@
 #include <base/rand_util.h>
 #include <base/stl_util.h>
 
+#include "build_config.h"
 #include "service_constants.h"
 
-// TODO(thestig) Merge these once libchrome catches up to Chromium's base.
+// TODO(thestig) Merge these once libchrome catches up to Chromium's base,
+// or when mtpd moves into its own repo. http://crbug.com/221123
 #if defined(CROS_BUILD)
 #include <base/string_number_conversions.h>
 #else

string_helpers.cc

diff --git a/string_helpers.cc b/string_helpers.cc
index b77d522..dc33c77 100644
--- a/string_helpers.cc
+++ b/string_helpers.cc
@@ -4,7 +4,15 @@
 
 #include "string_helpers.h"
 
+#include "build_config.h"
+
+// TODO(thestig) Merge these once libchrome catches up to Chromium's base,
+// or when mtpd moves into its own repo. http://crbug.com/221123
+#if defined(CROS_BUILD)
 #include <base/string_util.h>
+#else
+#include <base/strings/string_util.h>
+#endif
 
 namespace mtpd {