MultiMonitor support

content/test/test_renderer_host.cc

 // Copyright (c) 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 "content/test/test_renderer_host.h"
 
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/test/mock_render_process_host.h"
 #include "content/test/test_browser_context.h"
 
 #if defined(USE_AURA)
+#include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #endif
 
 namespace content {
 
 // Manages creation of the RenderViewHosts using our special subclass. This
 // automatically registers itself when it goes in scope, and unregisters itself
 // when it goes out of scope. Since you can't have more than one factory
@@ skipping 148 matching lines @@
 void RenderViewHostTestHarness::Reload() {
   NavigationEntry* entry = controller().GetLastCommittedEntry();
   DCHECK(entry);
   controller().Reload(false);
   static_cast<TestRenderViewHost*>(
       rvh())->SendNavigate(entry->GetPageID(), entry->GetURL());
 }
 
 void RenderViewHostTestHarness::SetUp() {
 #if defined(USE_AURA)
-  root_window_.reset(new aura::RootWindow);
+  root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
   test_stacking_client_.reset(
       new aura::test::TestStackingClient(root_window_.get()));
 #endif
   SetContents(CreateTestTabContents());
 }
 
 void RenderViewHostTestHarness::TearDown() {
   SetContents(NULL);
 #if defined(USE_AURA)
   test_stacking_client_.reset();
   root_window_.reset();
 #endif
 
   // Make sure that we flush any messages related to TabContents destruction
   // before we destroy the browser context.
   MessageLoop::current()->RunAllPending();
 
   // Release the browser context on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
   message_loop_.RunAllPending();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
     rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content