Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: ash/test/test_suite.cc

Issue 15755016: Introduce a single call to grab default browser on Win8 for tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | win8/test/metro_registration_helper.h » ('j') | win8/test/metro_registration_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_suite.cc
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index 458aaebcba889dd2488f73e76bc2e8d52a03b61a..9b51ad07b829946a4df36eab2b3b89bcafd32f1f 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -21,10 +21,9 @@
#endif
#if defined(OS_WIN)
+#include "base/win/scoped_com_initializer.h"
#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);
+ base::win::ScopedCOMInitializer com_initializer;
grt (UTC plus 2) 2013/05/27 16:11:14 COM shouldn't be initialized and uninitialized lik
gab 2013/05/27 16:47:58 I see, moved it as a member of AuraShellTestSuite
+ ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());
}
#endif
« no previous file with comments | « no previous file | win8/test/metro_registration_helper.h » ('j') | win8/test/metro_registration_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698