Revert 259580 "Move wm/public into wm target"

trunk/src/chrome/test/base/browser_with_test_window_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 
 #include "base/at_exit.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 18 matching lines @@
 
 #if defined(USE_ASH)
 namespace ash {
 namespace test {
 class AshTestHelper;
 }
 }
 #endif
 
 #if defined(USE_AURA)
-namespace wm {
-class WMTestHelper;
+namespace aura {
+namespace test {
+class AuraTestHelper;
+}
 }
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 namespace views {
 class ViewsDelegate;
 }
 #endif
 
 namespace content {
@@ skipping 129 matching lines @@
   scoped_ptr<Browser> browser_;
 
   // The existence of this object enables tests via
   // RenderViewHostTester.
   content::RenderViewHostTestEnabler rvh_test_enabler_;
 
 #if defined(USE_ASH)
   scoped_ptr<ash::test::AshTestHelper> ash_test_helper_;
 #endif
 #if defined(USE_AURA)
-  scoped_ptr<wm::WMTestHelper> wm_test_helper_;
+  scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   scoped_ptr<views::ViewsDelegate> views_delegate_;
 #endif
 
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   // The type of browser to create (tabbed or popup).
   Browser::Type browser_type_;
 
   // The desktop to create the initial window on.
   chrome::HostDesktopType host_desktop_type_;
 
   // Whether the browser is part of a hosted app.
   bool hosted_app_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_