diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
| commit | 5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac (patch) | |
| tree | b3b4d32437596c5462b1907e6c68f2db2d15b8a0 /sandbox/tests | |
| parent | 186bf92abfcce5136acb040c301959ff6ca96028 (diff) | |
| download | chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.zip chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.gz chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.bz2 | |
Revert 80819 due to failed tests
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/6816024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/tests')
| -rw-r--r-- | sandbox/tests/common/controller.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sandbox/tests/common/controller.cc b/sandbox/tests/common/controller.cc index b618069..7efd374 100644 --- a/sandbox/tests/common/controller.cc +++ b/sandbox/tests/common/controller.cc @@ -55,10 +55,9 @@ std::wstring MakePathToSysWow64(const wchar_t* name, bool is_obj_man_path) { namespace sandbox { std::wstring MakePathToSys(const wchar_t* name, bool is_obj_man_path) { - return (base::win::OSInfo::GetInstance()->wow64_status() == - base::win::OSInfo::WOW64_ENABLED) ? - MakePathToSysWow64(name, is_obj_man_path) : - MakePathToSys32(name, is_obj_man_path); + if (base::win::GetWOW64Status() == base::win::WOW64_ENABLED) + return MakePathToSysWow64(name, is_obj_man_path); + return MakePathToSys32(name, is_obj_man_path); } BrokerServices* GetBroker() { @@ -139,8 +138,7 @@ bool TestRunner::AddRuleSys32(TargetPolicy::Semantics semantics, if (!AddRule(TargetPolicy::SUBSYS_FILES, semantics, win32_path.c_str())) return false; - if (base::win::OSInfo::GetInstance()->wow64_status() != - base::win::OSInfo::WOW64_ENABLED) + if (base::win::GetWOW64Status() != base::win::WOW64_ENABLED) return true; win32_path = MakePathToSysWow64(pattern, false); |