Chromium Code Reviews| Index: ash/test/test_suite.cc |
| diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc |
| index 89a060b2a06d670a43d5aee41caba5b2a8c4f336..93fb3cbf21069a0f9c56bb4c992ccb8718ea1ab5 100644 |
| --- a/ash/test/test_suite.cc |
| +++ b/ash/test/test_suite.cc |
| @@ -19,6 +19,10 @@ |
| #if defined(OS_WIN) |
| #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 |
| namespace ash { |
| @@ -30,6 +34,21 @@ AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) |
| void AuraShellTestSuite::Initialize() { |
| base::TestSuite::Initialize(); |
| +#if defined(OS_WIN) |
| + if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
| + CHECK(win8::RegisterTestDefaultBrowser( |
| + win8::test::kDefaultTestAppUserModelId)); |
| + |
| + ui::win::CreateATLModuleIfNeeded(); |
| + |
| + std::vector<string16> choices; |
| + HRESULT result = S_OK; |
| + win8::OpenWithDialogController controller; |
| + result = controller.RunSynchronously(NULL, L"http", L"Test Runner", |
|
grt (UTC plus 2)
2013/02/12 15:37:43
Looks like |result| is never used. I propose you n
grt (UTC plus 2)
2013/02/12 15:37:43
L"Test Runner" -> kDefaultTestExeName
robertshield
2013/02/12 16:57:08
Done.
robertshield
2013/02/12 16:57:08
Done.
|
| + &choices); |
| + } |
| +#endif |
| + |
| gfx::RegisterPathProvider(); |
| ui::RegisterPathProvider(); |