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

Unified Diff: ash/test/ash_test_base.cc

Issue 12096064: Automatic Win8 default browser registration for the ash unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dear Greg Created 7 years, 10 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
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 5b4a6b6ecd85a1fbc756b3c7eeebe6985131d2f7..5e78ec76ca04d43b138e35a08ae29414eee12ef1 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -35,6 +35,7 @@
#include "base/win/windows_version.h"
#include "ui/aura/remote_root_window_host_win.h"
#include "ui/aura/root_window_host_win.h"
+#include "win8/test/test_registrar_constants.h"
#endif
namespace ash {
@@ -106,7 +107,8 @@ void AshTestBase::SetUp() {
if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
metro_viewer_host_.reset(new TestMetroViewerProcessHost("viewer"));
ASSERT_TRUE(
- metro_viewer_host_->LaunchImmersiveChromeAndWaitForConnection());
+ metro_viewer_host_->LaunchViewerAndWaitForConnection(
+ win8::test::kDefaultTestAppUserModelId));
aura::RemoteRootWindowHostWin* root_window_host =
aura::RemoteRootWindowHostWin::Instance();
ASSERT_TRUE(root_window_host != NULL);
« no previous file with comments | « ash/ash.gyp ('k') | ash/test/test_metro_viewer_process_host.h » ('j') | ash/test/test_suite.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698