diff options
| author | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 04:06:43 +0000 |
|---|---|---|
| committer | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 04:06:43 +0000 |
| commit | 1fd5302cf7083ff593667703d144aa84d3cf7e5d (patch) | |
| tree | d64d5a1e377638aa696b57d4ba2bb928779752b5 /chrome/common/service_process_util_unittest.cc | |
| parent | 8b02f7de252dba372f6f393a2f0130f893af3cb9 (diff) | |
| download | chromium_src-1fd5302cf7083ff593667703d144aa84d3cf7e5d.zip chromium_src-1fd5302cf7083ff593667703d144aa84d3cf7e5d.tar.gz chromium_src-1fd5302cf7083ff593667703d144aa84d3cf7e5d.tar.bz2 | |
Replace many OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, since most of them apply to non-linux Unix also. Non-linux Unices tested are the BSDs and Solaris.
Review URL: http://codereview.chromium.org/3556009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/service_process_util_unittest.cc')
| -rw-r--r-- | chrome/common/service_process_util_unittest.cc | 6 |
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 81ca377..89bd230 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -24,7 +24,7 @@ #include "base/win/win_util.h" #endif -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) #include "chrome/common/auto_start_linux.h" #include <glib.h> #endif @@ -114,7 +114,7 @@ TEST_F(ServiceProcessStateTest, AutoRun) { UTF8ToWide(value_name), &value)); autorun_command_line.reset(new CommandLine(CommandLine::FromString(value))); -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) std::string base_desktop_name = "google-chrome-service.desktop"; #else // CHROMIUM_BUILD @@ -143,7 +143,7 @@ TEST_F(ServiceProcessStateTest, AutoRun) { EXPECT_FALSE(base::win::ReadCommandFromAutoRun(HKEY_CURRENT_USER, UTF8ToWide(value_name), &value)); -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) EXPECT_FALSE(AutoStart::GetAutostartFileValue( GetServiceProcessScopedName(base_desktop_name), "Exec", &exec_value)); #endif // defined(OS_WIN) |