Merge 129867 - Don't set single monitor manager under multi monitor environment.

BUG=28581
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9923027

TBR=oshima@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9963034

git-svn-id: svn://svn.chromium.org/chrome/branches/1084/src@129966 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 32 insertions, 13 deletions

diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index 01ee4a5..bec936d 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -25,8 +25,10 @@
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(USE_AURA)
+#include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #endif
@@ -126,6 +128,8 @@ class AccessibilityEventRouterViewsTest
   virtual void SetUp() {
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
+    aura::Env::GetInstance()->SetMonitorManager(
+        new aura::test::SingleMonitorManager);
     root_window_.reset(
         aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
     gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index d4234d9..ae4942a 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -16,8 +16,10 @@
 #include "content/test/test_renderer_host.h"
 
 #if defined(USE_AURA)
+#include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
@@ -44,6 +46,8 @@ void BrowserWithTestWindowTest::SetUp() {
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 #if defined(USE_AURA)
+  aura::Env::GetInstance()->SetMonitorManager(
+      new aura::test::SingleMonitorManager);
   root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
   test_activation_client_.reset(
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc
index 21df81b..03ce44e 100644
--- a/content/test/test_renderer_host.cc
+++ b/content/test/test_renderer_host.cc
@@ -14,8 +14,10 @@
 #include "content/test/test_browser_context.h"
 
 #if defined(USE_AURA)
+#include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #endif
@@ -190,6 +192,8 @@ void RenderViewHostTestHarness::Reload() {
 
 void RenderViewHostTestHarness::SetUp() {
 #if defined(USE_AURA)
+  aura::Env::GetInstance()->SetMonitorManager(
+      new aura::test::SingleMonitorManager);
   root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
   test_stacking_client_.reset(
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 55ba572..f4dbf96 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -81,8 +81,6 @@
         'monitor_change_observer_x11.h',
         'monitor_manager.cc',
         'monitor_manager.h',
-        'single_monitor_manager.h',
-        'single_monitor_manager.cc',
         'root_window_host.h',
         'root_window_host_linux.cc',
         'root_window_host_linux.h',
@@ -139,6 +137,8 @@
         'test/aura_test_helper.h',
         'test/event_generator.cc',
         'test/event_generator.h',
+        'test/single_monitor_manager.h',
+        'test/single_monitor_manager.cc',
         'test/test_activation_client.cc',
         'test/test_activation_client.h',
         'test/test_event_filter.cc',
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 6da06ef..747c74c 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -4,7 +4,7 @@
 
 #include "ui/aura/env.h"
 #include "ui/aura/env_observer.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/compositor.h"
@@ -77,7 +77,6 @@ void Env::Init() {
 #if defined(USE_X11)
   monitor_change_observer_.reset(new internal::MonitorChangeObserverX11);
 #endif
-  SetMonitorManager(new internal::SingleMonitorManager);
   ui::Compositor::Initialize(false);
 }
 
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 592c780..ba5f44f 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -6,8 +6,8 @@
 
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
-#include "ui/aura/single_monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura/ui_controls_aura.h"
@@ -24,6 +24,7 @@ AuraTestBase::~AuraTestBase() {
 
 void AuraTestBase::SetUp() {
   testing::Test::SetUp();
+  Env::GetInstance()->SetMonitorManager(new SingleMonitorManager);
   root_window_.reset(Env::GetInstance()->monitor_manager()->
                      CreateRootWindowForPrimaryMonitor());
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
diff --git a/ui/aura/single_monitor_manager.cc b/ui/aura/test/single_monitor_manager.cc
index 57e68ac..6e52500 100644
--- a/ui/aura/single_monitor_manager.cc
+++ b/ui/aura/test/single_monitor_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
 
 #include <string>
 
@@ -14,7 +14,7 @@
 #include "ui/gfx/rect.h"
 
 namespace aura {
-namespace internal {
+namespace test {
 
 using std::string;
 
@@ -99,5 +99,5 @@ void SingleMonitorManager::Update(const gfx::Size size) {
   monitor_->set_size(size);
 }
 
-}  // namespace inernal
+}  // namespace test
 }  // namespace aura
diff --git a/ui/aura/single_monitor_manager.h b/ui/aura/test/single_monitor_manager.h
index 5afbcd2..58b65ef 100644
--- a/ui/aura/single_monitor_manager.h
+++ b/ui/aura/test/single_monitor_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SINGLE_MONITOR_MANAGER_H_
-#define UI_AURA_SINGLE_MONITOR_MANAGER_H_
+#ifndef UI_AURA_TEST_SINGLE_MONITOR_MANAGER_H_
+#define UI_AURA_TEST_SINGLE_MONITOR_MANAGER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -16,7 +16,7 @@ class Rect;
 }
 
 namespace aura {
-namespace internal {
+namespace test {
 
 // A monitor manager assuming there is one monitor.
 class SingleMonitorManager : public MonitorManager,
@@ -53,7 +53,7 @@ class SingleMonitorManager : public MonitorManager,
   DISALLOW_COPY_AND_ASSIGN(SingleMonitorManager);
 };
 
-}  // namespace internal
+}  // namespace test
 }  // namespace aura
 
-#endif  //  UI_AURA_SINGLE_MONITOR_MANAGER_H_
+#endif  //  UI_AURA_TEST_SINGLE_MONITOR_MANAGER_H_
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index e1999d8..9ed163a 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -10,6 +10,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
@@ -79,6 +80,8 @@ void ViewsTestBase::SetUp() {
   if (!views_delegate_.get())
     views_delegate_.reset(new TestViewsDelegate());
 #if defined(USE_AURA)
+  aura::Env::GetInstance()->SetMonitorManager(
+      new aura::test::SingleMonitorManager);
   root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
   root_window_->SetProperty(
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index cfe79f7..abfcd57 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -8,9 +8,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura/window.h"
@@ -35,6 +37,8 @@ class NativeWidgetAuraTest : public testing::Test {
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
+    aura::Env::GetInstance()->SetMonitorManager(
+        new aura::test::SingleMonitorManager);
     root_window_.reset(
         aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
     gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));