Revert 132294 - Aura demo fix

BUG=123311
TEST=sadrul@chromium.org


Review URL: http://codereview.chromium.org/10082008

TBR=oshima@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132298 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 28 insertions, 19 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 6a1121e..f45e1c9 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -28,7 +28,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.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
@@ -128,7 +128,8 @@ class AccessibilityEventRouterViewsTest
   virtual void SetUp() {
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
-    aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+    aura::Env::GetInstance()->SetMonitorManager(
+        new aura::test::SingleMonitorManager);
     root_window_.reset(
         aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
 #if defined(USE_ASH)
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index ca71fb5..e0a81cb 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -23,7 +23,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_stacking_client.h"
 #endif
@@ -49,7 +49,8 @@ void BrowserWithTestWindowTest::SetUp() {
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 #if defined(USE_AURA)
-  aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+  aura::Env::GetInstance()->SetMonitorManager(
+      new aura::test::SingleMonitorManager);
   root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
 #if defined(USE_ASH)
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc
index ea9dce7..2185678 100644
--- a/content/test/test_renderer_host.cc
+++ b/content/test/test_renderer_host.cc
@@ -21,7 +21,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_stacking_client.h"
 #endif
 
@@ -195,7 +195,8 @@ void RenderViewHostTestHarness::Reload() {
 
 void RenderViewHostTestHarness::SetUp() {
 #if defined(USE_AURA)
-  aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+  aura::Env::GetInstance()->SetMonitorManager(
+      new aura::test::SingleMonitorManager);
   root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
 #if defined(USE_ASH)
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 6bea410..9a7cefb 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -88,8 +88,6 @@
         'root_window_view_mac.mm',
         'root_window.cc',
         'root_window.h',
-        'single_monitor_manager.cc',
-        'single_monitor_manager.h',
         'ui_controls_win.cc',
         'ui_controls_x11.cc',
         'window.cc',
@@ -133,6 +131,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/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index c4782b0..7291c60 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -11,7 +11,7 @@
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/event.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ -111,7 +111,7 @@ int main(int argc, char** argv) {
   // Create the message-loop here before creating the root window.
   MessageLoop message_loop(MessageLoop::TYPE_UI);
   ui::CompositorTestSupport::Initialize();
-  aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+
   scoped_ptr<aura::RootWindow> root_window(
       aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
   scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient(
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 9a0a7ae..4b4e75b 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -7,7 +7,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/base/gestures/gesture_configuration.h"
diff --git a/ui/aura/single_monitor_manager.cc b/ui/aura/test/single_monitor_manager.cc
index 4797327..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,6 +14,7 @@
 #include "ui/gfx/rect.h"
 
 namespace aura {
+namespace test {
 
 using std::string;
 
@@ -98,4 +99,5 @@ void SingleMonitorManager::Update(const gfx::Size size) {
   monitor_->set_size(size);
 }
 
+}  // namespace test
 }  // namespace aura
diff --git a/ui/aura/single_monitor_manager.h b/ui/aura/test/single_monitor_manager.h
index ab7c7af..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,6 +16,7 @@ class Rect;
 }
 
 namespace aura {
+namespace test {
 
 // A monitor manager assuming there is one monitor.
 class SingleMonitorManager : public MonitorManager,
@@ -52,6 +53,7 @@ class SingleMonitorManager : public MonitorManager,
   DISALLOW_COPY_AND_ASSIGN(SingleMonitorManager);
 };
 
+}  // 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 996582f..1e05f50 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -14,7 +14,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/base/ime/input_method.h"
@@ -83,7 +83,8 @@ void ViewsTestBase::SetUp() {
   if (!views_delegate_.get())
     views_delegate_.reset(new TestViewsDelegate());
 #if defined(USE_AURA)
-  aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+  aura::Env::GetInstance()->SetMonitorManager(
+      new aura::test::SingleMonitorManager);
   root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
 #if defined(USE_ASH)
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index ecf03e4..163f43c 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -12,7 +12,7 @@
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/root_view.h"
@@ -40,7 +40,8 @@ class NativeWidgetAuraTest : public testing::Test {
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
-    aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+    aura::Env::GetInstance()->SetMonitorManager(
+        new aura::test::SingleMonitorManager);
     root_window_.reset(
         aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
 #if defined(USE_ASH)