| Index: ash/test/test_suite.cc
|
| diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
|
| index 458aaebcba889dd2488f73e76bc2e8d52a03b61a..2371b49a99afc785909f156dbe8725791490701c 100644
|
| --- a/ash/test/test_suite.cc
|
| +++ b/ash/test/test_suite.cc
|
| @@ -24,7 +24,6 @@
|
| #include "base/win/windows_version.h"
|
| #include "ui/base/win/atl_module.h"
|
| #include "win8/test/metro_registration_helper.h"
|
| -#include "win8/test/open_with_dialog_controller.h"
|
| #include "win8/test/test_registrar_constants.h"
|
| #endif
|
|
|
| @@ -41,16 +40,8 @@ void AuraShellTestSuite::Initialize() {
|
| if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
|
| !CommandLine::ForCurrentProcess()->HasSwitch(
|
| ash::switches::kForceAshToDesktop)) {
|
| - ASSERT_TRUE(win8::RegisterTestDefaultBrowser(
|
| - win8::test::kDefaultTestAppUserModelId,
|
| - win8::test::kDefaultTestExeName));
|
| -
|
| ui::win::CreateATLModuleIfNeeded();
|
| -
|
| - std::vector<base::string16> choices;
|
| - win8::OpenWithDialogController controller;
|
| - controller.RunSynchronously(NULL, L"http", win8::test::kDefaultTestExeName,
|
| - &choices);
|
| + ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());
|
| }
|
| #endif
|
|
|
|
|