Rename MinimalShell to WMTestHelper.

As requested by Ben in https://codereview.chromium.org/74183002/

* Rename minimal_shell.* to wm_test_helper.*

BUG=308710
TEST=None
R=ben@chromium.org

Review URL: https://codereview.chromium.org/70513007

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

3 files changed, 20 insertions, 21 deletions

diff --git a/ui/wm/test/minimal_shell.cc b/ui/wm/test/wm_test_helper.cc
index d2c289e..31f237d 100644
--- a/ui/wm/test/minimal_shell.cc
+++ b/ui/wm/test/wm_test_helper.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/wm/test/minimal_shell.h"
+#include "ui/wm/test/wm_test_helper.h"
 
 #include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
@@ -14,7 +14,7 @@
 
 namespace wm {
 
-MinimalShell::MinimalShell(const gfx::Size& default_window_size) {
+WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) {
   aura::Env::CreateInstance();
   root_window_.reset(new aura::RootWindow(
       aura::RootWindow::CreateParams(
@@ -42,14 +42,13 @@ MinimalShell::MinimalShell(const gfx::Size& default_window_size) {
       new aura::client::DefaultCaptureClient(root_window_->window()));
 }
 
-MinimalShell::~MinimalShell() {
+WMTestHelper::~WMTestHelper() {
   root_window_event_filter_->RemoveHandler(input_method_filter_.get());
 }
 
-aura::Window* MinimalShell::GetDefaultParent(
-    aura::Window* context,
-    aura::Window* window,
-    const gfx::Rect& bounds) {
+aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
+                                             aura::Window* window,
+                                             const gfx::Rect& bounds) {
   return root_window_->window();
 }
 
diff --git a/ui/wm/test/minimal_shell.h b/ui/wm/test/wm_test_helper.h
index 71cfb8b..ba23ee7 100644
--- a/ui/wm/test/minimal_shell.h
+++ b/ui/wm/test/wm_test_helper.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_WM_TEST_MINIMAL_SHELL_H_
-#define UI_WM_TEST_MINIMAL_SHELL_H_
+#ifndef UI_WM_TEST_WM_TEST_HELPER_H_
+#define UI_WM_TEST_WM_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -16,30 +16,30 @@ namespace client {
 class DefaultActivationClient;
 class DefaultCaptureClient;
 class FocusClient;
-}  // class client
-}  // class aura
+}
+}
 
 namespace gfx {
 class Rect;
 class Size;
-}  // class gfx
+}
 
 namespace views {
 namespace corewm {
 class CompoundEventFilter;
 class InputMethodEventFilter;
-}  // corewm
-}  // views
+}
+}
 
 namespace wm {
 
 // Creates a minimal environment for running the shell. We can't pull in all of
 // ash here, but we can create attach several of the same things we'd find in
 // the ash parts of the code.
-class MinimalShell : public aura::client::WindowTreeClient {
+class WMTestHelper : public aura::client::WindowTreeClient {
  public:
-  explicit MinimalShell(const gfx::Size& default_window_size);
-  virtual ~MinimalShell();
+  explicit WMTestHelper(const gfx::Size& default_window_size);
+  virtual ~WMTestHelper();
 
   aura::RootWindow* root_window() { return root_window_.get(); }
 
@@ -59,9 +59,9 @@ class MinimalShell : public aura::client::WindowTreeClient {
   scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(MinimalShell);
+  DISALLOW_COPY_AND_ASSIGN(WMTestHelper);
 };
 
 }  // namespace wm
 
-#endif  // UI_WM_TEST_MINIMAL_SHELL_H_
+#endif  // UI_WM_TEST_WM_TEST_HELPER_H_
diff --git a/ui/wm/wm.gyp b/ui/wm/wm.gyp
index 38158b0..4a681c1 100644
--- a/ui/wm/wm.gyp
+++ b/ui/wm/wm.gyp
@@ -16,8 +16,8 @@
         '../views/views.gyp:views',
       ],
       'sources': [
-        'test/minimal_shell.cc',
-        'test/minimal_shell.h',
+        'test/wm_test_helper.cc',
+        'test/wm_test_helper.h',
       ],
     },
   ],