Eliminate ash::internal namespace

ash/touch/touch_observer_hud_unittest.cc

 // Copyright (c) 2013 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 "ash/touch/touch_observer_hud.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/touch/touch_hud_projection.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/window.h"
 
 namespace ash {
-namespace internal {
 
 class TouchHudTestBase : public test::AshTestBase {
  public:
   TouchHudTestBase() {}
   virtual ~TouchHudTestBase() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
 
     // Initialize display infos. They should be initialized after Ash
@@ skipping 123 matching lines @@
   aura::Window* GetPrimaryRootWindow() {
     const gfx::Display& display = GetPrimaryDisplay();
     return GetDisplayController()->GetRootWindowForDisplayId(display.id());
   }
 
   aura::Window* GetSecondaryRootWindow() {
     const gfx::Display& display = GetSecondaryDisplay();
     return GetDisplayController()->GetRootWindowForDisplayId(display.id());
   }
 
-  internal::RootWindowController* GetInternalRootController() {
+  RootWindowController* GetInternalRootController() {
     aura::Window* root = GetInternalRootWindow();
     return GetRootWindowController(root);
   }
 
-  internal::RootWindowController* GetExternalRootController() {
+  RootWindowController* GetExternalRootController() {
     aura::Window* root = GetExternalRootWindow();
     return GetRootWindowController(root);
   }
 
-  internal::RootWindowController* GetPrimaryRootController() {
+  RootWindowController* GetPrimaryRootController() {
     aura::Window* root = GetPrimaryRootWindow();
     return GetRootWindowController(root);
   }
 
-  internal::RootWindowController* GetSecondaryRootController() {
+  RootWindowController* GetSecondaryRootController() {
     aura::Window* root = GetSecondaryRootWindow();
     return GetRootWindowController(root);
   }
 
   DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
     DisplayInfo info(id, base::StringPrintf("x-%" PRId64, id), false);
     info.SetBounds(bounds);
     return info;
   }
 
-  aura::Window* GetRootWindowForTouchHud(internal::TouchObserverHUD* hud) {
+  aura::Window* GetRootWindowForTouchHud(TouchObserverHUD* hud) {
     return hud->root_window_;
   }
 
-  views::Widget* GetWidgetForTouchHud(internal::TouchObserverHUD* hud) {
+  views::Widget* GetWidgetForTouchHud(TouchObserverHUD* hud) {
     return hud->widget_;
   }
 
   int64 internal_display_id_;
   int64 external_display_id_;
   int64 mirrored_display_id_;
   DisplayInfo internal_display_info_;
   DisplayInfo external_display_info_;
   DisplayInfo mirrored_display_info_;
 
@@ skipping 10 matching lines @@
   virtual void SetUp() OVERRIDE {
     // Add ash-touch-hud flag to enable debug touch HUD. This flag should be set
     // before Ash environment is set up, i.e., before TouchHudTestBase::SetUp().
     CommandLine::ForCurrentProcess()->AppendSwitch(
         ash::switches::kAshTouchHud);
 
     TouchHudTestBase::SetUp();
   }
 
   void CheckInternalDisplay() {
-    EXPECT_NE(static_cast<internal::TouchObserverHUD*>(NULL),
-              GetInternalTouchHudDebug());
+    EXPECT_NE(static_cast<TouchObserverHUD*>(NULL), GetInternalTouchHudDebug());
     EXPECT_EQ(internal_display_id(), GetInternalTouchHudDebug()->display_id());
     EXPECT_EQ(GetInternalRootWindow(),
               GetRootWindowForTouchHud(GetInternalTouchHudDebug()));
     EXPECT_EQ(GetInternalRootWindow(),
               GetWidgetForTouchHud(GetInternalTouchHudDebug())->
                   GetNativeView()->GetRootWindow());
     EXPECT_EQ(GetInternalDisplay().size(),
               GetWidgetForTouchHud(GetInternalTouchHudDebug())->
                   GetWindowBoundsInScreen().size());
   }
 
   void CheckExternalDisplay() {
-    EXPECT_NE(static_cast<internal::TouchHudDebug*>(NULL),
-              GetExternalTouchHudDebug());
+    EXPECT_NE(static_cast<TouchHudDebug*>(NULL), GetExternalTouchHudDebug());
     EXPECT_EQ(external_display_id(), GetExternalTouchHudDebug()->display_id());
     EXPECT_EQ(GetExternalRootWindow(),
               GetRootWindowForTouchHud(GetExternalTouchHudDebug()));
     EXPECT_EQ(GetExternalRootWindow(),
               GetWidgetForTouchHud(GetExternalTouchHudDebug())->
                   GetNativeView()->GetRootWindow());
     EXPECT_EQ(GetExternalDisplay().size(),
               GetWidgetForTouchHud(GetExternalTouchHudDebug())->
                   GetWindowBoundsInScreen().size());
   }
 
  private:
-  internal::TouchHudDebug* GetInternalTouchHudDebug() {
+  TouchHudDebug* GetInternalTouchHudDebug() {
     return GetInternalRootController()->touch_hud_debug();
   }
 
-  internal::TouchHudDebug* GetExternalTouchHudDebug() {
+  TouchHudDebug* GetExternalTouchHudDebug() {
     return GetExternalRootController()->touch_hud_debug();
   }
 
-  internal::TouchHudDebug* GetPrimaryTouchHudDebug() {
+  TouchHudDebug* GetPrimaryTouchHudDebug() {
     return GetPrimaryRootController()->touch_hud_debug();
   }
 
-  internal::TouchHudDebug* GetSecondaryTouchHudDebug() {
+  TouchHudDebug* GetSecondaryTouchHudDebug() {
     return GetSecondaryRootController()->touch_hud_debug();
   }
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudDebugTest);
 };
 
 class TouchHudProjectionTest : public TouchHudTestBase {
  public:
   TouchHudProjectionTest() {}
   virtual ~TouchHudProjectionTest() {}
 
   void EnableTouchHudProjection() {
     Shell::GetInstance()->SetTouchHudProjectionEnabled(true);
   }
 
   void DisableTouchHudProjection() {
     Shell::GetInstance()->SetTouchHudProjectionEnabled(false);
   }
 
-  internal::TouchHudProjection* GetInternalTouchHudProjection() {
+  TouchHudProjection* GetInternalTouchHudProjection() {
     return GetInternalRootController()->touch_hud_projection();
   }
 
   int GetInternalTouchPointsCount() {
     return GetInternalTouchHudProjection()->points_.size();
   }
 
   void SendTouchEventToInternalHud(ui::EventType type,
                                    const gfx::Point& location,
                                    int touch_id) {
@@ skipping 193 matching lines @@
   CheckInternalDisplay();
 }
 
 // Checks projection touch HUD with a sequence of touch-pressed, touch-moved,
 // and touch-released events.
 TEST_F(TouchHudProjectionTest, TouchMoveRelease) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
-  EXPECT_NE(static_cast<internal::TouchHudProjection*>(NULL),
+  EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::Point(10, 20), 1);
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 // Checks projection touch HUD with a sequence of touch-pressed, touch-moved,
 // and touch-cancelled events.
 TEST_F(TouchHudProjectionTest, TouchMoveCancel) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
-  EXPECT_NE(static_cast<internal::TouchHudProjection*>(NULL),
+  EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_CANCELLED, gfx::Point(10, 20), 1);
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 // Checks projection touch HUD with two simultaneous touches.
 TEST_F(TouchHudProjectionTest, DoubleTouch) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
-  EXPECT_NE(static_cast<internal::TouchHudProjection*>(NULL),
+  EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(20, 10), 2);
   EXPECT_EQ(2, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
@@ skipping 13 matching lines @@
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 // Checks if turning off touch HUD projection while touching the screen is
 // handled correctly.
 TEST_F(TouchHudProjectionTest, DisableWhileTouching) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
-  EXPECT_NE(static_cast<internal::TouchHudProjection*>(NULL),
+  EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
-}  // namespace internal
 }  // namespace ash