summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration_unittest.cc
diff options
context:
space:
mode:
authorchromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 04:06:43 +0000
committerchromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 04:06:43 +0000
commit1fd5302cf7083ff593667703d144aa84d3cf7e5d (patch)
treed64d5a1e377638aa696b57d4ba2bb928779752b5 /chrome/browser/shell_integration_unittest.cc
parent8b02f7de252dba372f6f393a2f0130f893af3cb9 (diff)
downloadchromium_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/browser/shell_integration_unittest.cc')
-rw-r--r--chrome/browser/shell_integration_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index 3158f51..740e518 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -22,13 +22,13 @@
#if defined(OS_WIN)
#include "chrome/installer/util/browser_distribution.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
#include "base/environment.h"
-#endif // defined(OS_LINUX)
+#endif
#define FPL FILE_PATH_LITERAL
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
namespace {
// Provides mock environment variables values based on a stored map.