2 files changed, 9 insertions, 4 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index a59019b..3dd9455 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -7,6 +7,7 @@
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
+#include "ash/shell_init_params.h"
 #include "ash/test/ash_test_views_delegate.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/shell_test_api.h"
@@ -84,7 +85,9 @@ void AshTestHelper::SetUp(bool start_session) {
   // created in AshTestBase tests.
   chromeos::CrasAudioHandler::InitializeForTesting();
 #endif
-  ash::Shell::CreateInstance(test_shell_delegate_);
+  ShellInitParams init_params;
+  init_params.delegate = test_shell_delegate_;
+  ash::Shell::CreateInstance(init_params);
   aura::test::EnvTestHelper(aura::Env::GetInstance()).SetInputStateLookup(
       scoped_ptr<aura::InputStateLookup>());
 
diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc
index 5dd448c..85df3e2 100644
--- a/ash/test/test_metro_viewer_process_host.cc
+++ b/ash/test/test_metro_viewer_process_host.cc
@@ -8,13 +8,15 @@
 
 #include "base/logging.h"
 #include "ui/aura/remote_window_tree_host_win.h"
+#include "ui/gfx/win/dpi.h"
 
 namespace ash {
 namespace test {
 
 TestMetroViewerProcessHost::TestMetroViewerProcessHost(
     base::SingleThreadTaskRunner* ipc_task_runner)
-        : MetroViewerProcessHost(ipc_task_runner), closed_unexpectedly_(false) {
+    : MetroViewerProcessHost(ipc_task_runner),
+      closed_unexpectedly_(false) {
 }
 
 TestMetroViewerProcessHost::~TestMetroViewerProcessHost() {
@@ -30,8 +32,8 @@ void TestMetroViewerProcessHost::OnSetTargetSurface(
     float device_scale) {
   DLOG(INFO) << __FUNCTION__ << ", target_surface = " << target_surface;
   HWND hwnd = reinterpret_cast<HWND>(target_surface);
-  aura::RemoteWindowTreeHostWin::Instance()->
-      InitializeRemoteWindowAndScaleFactor(hwnd, device_scale);
+  gfx::InitDeviceScaleFactor(device_scale);
+  aura::RemoteWindowTreeHostWin::Instance()->SetRemoteWindowHandle(hwnd);
   aura::RemoteWindowTreeHostWin::Instance()->Connected(this);
 }