Makes construction of (ash)RemoteWindowTreeHostWin explicit

chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/host/ash_remote_window_tree_host_win.h"
 #include "ash/shell.h"
@@ skipping 102 matching lines @@
     DVLOG(1) << "No GPU access, attempting to restart in Desktop\n";
     chrome::AttemptRestartToDesktopMode();
   }
 }
 
 void ChromeMetroViewerProcessHost::OnSetTargetSurface(
     gfx::NativeViewId target_surface,
     float device_scale) {
   HWND hwnd = reinterpret_cast<HWND>(target_surface);
 
-  // Make hwnd available as early as possible for proper InputMethod
-  // initialization.
-  ash::AshRemoteWindowTreeHostWin::Init();
-  aura::RemoteWindowTreeHostWin::Instance()->
-      InitializeRemoteWindowAndScaleFactor(hwnd, device_scale);
-
-  // Now start the Ash shell environment.
-  chrome::OpenAsh();
+  gfx::InitDeviceScaleFactor(device_scale);
+  chrome::OpenAsh(hwnd);
+  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
+  DCHECK_EQ(hwnd, aura::RemoteWindowTreeHostWin::Instance()->remote_window());
   ash::Shell::GetInstance()->CreateShelf();
   ash::Shell::GetInstance()->ShowShelf();
 
   // Tell our root window host that the viewer has connected.
   aura::RemoteWindowTreeHostWin::Instance()->Connected(this);
 
   // On Windows 8 ASH we default to SHOW_STATE_MAXIMIZED for the browser
   // window. This is to ensure that we honor metro app conventions by default.
   ash::WindowPositioner::SetMaximizeFirstWindow(true);
   // Tell the rest of Chrome that Ash is running.
@@ skipping 18 matching lines @@
 void ChromeMetroViewerProcessHost::OnWindowSizeChanged(uint32 width,
                                                        uint32 height) {
   std::vector<ash::DisplayInfo> info_list;
   info_list.push_back(ash::DisplayInfo::CreateFromSpec(
       base::StringPrintf("%dx%d*%f", width, height, gfx::GetDPIScale())));
   ash::Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(
       info_list);
   aura::RemoteWindowTreeHostWin::Instance()->HandleWindowSizeChanged(width,
                                                                      height);
 }