Move wm/public into wm target

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 14 matching lines @@
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 #if defined(USE_AURA)
-#include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/wm/test/wm_test_helper.h"
 #endif
 
 using base::ASCIIToUTF16;
 
 class AccessibilityViewsDelegate : public views::TestViewsDelegate {
  public:
   AccessibilityViewsDelegate() {}
   virtual ~AccessibilityViewsDelegate() {}
 
   // Overridden from views::TestViewsDelegate:
@@ skipping 56 matching lines @@
   virtual void SetUp() {
 #if defined(OS_WIN)
     ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
     // The ContextFactory must exist before any Compositors are created.
     bool enable_pixel_output = false;
     ui::InitializeContextFactoryForTests(enable_pixel_output);
 
-    aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
-    aura_test_helper_->SetUp();
+    wm_test_helper_.reset(new wm::WMTestHelper);
+    wm_test_helper_->SetUp();
 #endif  // USE_AURA
     EnableAccessibilityAndListenToFocusNotifications();
   }
 
   virtual void TearDown() {
     ClearCallback();
 #if defined(USE_AURA)
-    aura_test_helper_->TearDown();
+    wm_test_helper_->TearDown();
     ui::TerminateContextFactoryForTests();
 #endif
     delete views::ViewsDelegate::views_delegate;
     views::ViewsDelegate::views_delegate = NULL;
 
     // The Widget's FocusManager is deleted using DeleteSoon - this
     // forces it to be deleted now, so we don't have any memory leaks
     // when this method exits.
     base::MessageLoop::current()->RunUntilIdle();
 
 #if defined(OS_WIN)
     ole_initializer_.reset();
 #endif
   }
 
   views::Widget* CreateWindowWithContents(views::View* contents) {
     gfx::NativeView context = NULL;
 #if defined(USE_AURA)
-    context = aura_test_helper_->root_window();
+    context = wm_test_helper_->root_window();
 #endif
     views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
         new AccessibilityWindowDelegate(contents),
         context,
         gfx::Rect(0, 0, 500, 500));
 
     // Create a profile and associate it with this window.
     widget->SetNativeWindowProperty(Profile::kProfileKey, &profile_);
 
     return widget;
@@ skipping 28 matching lines @@
   base::MessageLoopForUI message_loop_;
   int control_event_count_;
   std::string last_control_type_;
   std::string last_control_name_;
   std::string last_control_context_;
   TestingProfile profile_;
 #if defined(OS_WIN)
   scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
 #endif
 #if defined(USE_AURA)
-  scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
+  scoped_ptr<wm::WMTestHelper> wm_test_helper_;
 #endif
 };
 
 TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
   const char kButton1ASCII[] = "Button1";
   const char kButton2ASCII[] = "Button2";
   const char kButton3ASCII[] = "Button3";
   const char kButton3NewASCII[] = "Button3New";
 
   // Create a contents view with 3 buttons.
@@ skipping 297 matching lines @@
 
     AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
         menu_container,
         menu->GetMenuItemByID(kTestCases[i].command_id),
         &index,
         &count);
     EXPECT_EQ(kTestCases[i].expected_index, index) << "Case " << i;
     EXPECT_EQ(kTestCases[i].expected_count, count) << "Case " << i;
   }
 }