From 5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac Mon Sep 17 00:00:00 2001 From: "mmenke@chromium.org" Date: Thu, 7 Apr 2011 19:34:45 +0000 Subject: 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 --- sandbox/tests/common/controller.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'sandbox/tests') 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); -- cgit v1.1