summaryrefslogtreecommitdiffstats
path: root/chrome/common/service_process_util_unittest.cc
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 02:28:17 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 02:28:17 +0000
commit9f6167c55460a790d2d06630c41eae0f9670d70a (patch)
tree7b39dd368cca8d0527ddb7dbe417f83198403705 /chrome/common/service_process_util_unittest.cc
parentdb6a876afe73ed1ad3befa04d0612527222ac168 (diff)
downloadchromium_src-9f6167c55460a790d2d06630c41eae0f9670d70a.zip
chromium_src-9f6167c55460a790d2d06630c41eae0f9670d70a.tar.gz
chromium_src-9f6167c55460a790d2d06630c41eae0f9670d70a.tar.bz2
Completely remove the service process for Android.
It's only used by cloud print which isn't supported. BUG=117407 TEST= Review URL: http://codereview.chromium.org/9702025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/service_process_util_unittest.cc')
-rw-r--r--chrome/common/service_process_util_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index 2501c93..faac2fe 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -26,7 +26,7 @@
#include "base/win/win_util.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX)
#include "chrome/common/auto_start_linux.h"
#include <glib.h>
#endif
@@ -128,7 +128,7 @@ TEST_F(ServiceProcessStateTest, AutoRun) {
UTF8ToWide(value_name),
&value));
autorun_command_line.reset(new CommandLine(CommandLine::FromString(value)));
-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
std::string base_desktop_name = "google-chrome-service.desktop";
#else // CHROMIUM_BUILD
@@ -157,7 +157,7 @@ TEST_F(ServiceProcessStateTest, AutoRun) {
EXPECT_FALSE(base::win::ReadCommandFromAutoRun(HKEY_CURRENT_USER,
UTF8ToWide(value_name),
&value));
-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
EXPECT_FALSE(AutoStart::GetAutostartFileValue(
GetServiceProcessScopedName(base_desktop_name), "Exec", &exec_value));
#endif // defined(OS_WIN)