Fix the content_browsertests everywhere maybe.

content/shell/minimal_ash.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 CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
-#define CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
+#ifndef CONTENT_SHELL_MINIMAL_ASH_H_
+#define CONTENT_SHELL_MINIMAL_ASH_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/stacking_client.h"
 
 namespace aura {
 class RootWindow;
 class Window;
 namespace client {
 class DefaultCaptureClient;
@@ skipping 13 matching lines @@
 class CompoundEventFilter;
 class InputMethodEventFilter;
 }
 }
 
 namespace content {
 
 // 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 ShellStackingClientAsh : public aura::client::StackingClient {
+class MinimalAsh : public aura::client::StackingClient {
  public:
-  ShellStackingClientAsh();
-  virtual ~ShellStackingClientAsh();
+  MinimalAsh();
+  virtual ~MinimalAsh();
 
   // Overridden from client::StackingClient:
   virtual aura::Window* GetDefaultParent(aura::Window* context,
                                          aura::Window* window,
                                          const gfx::Rect& bounds) OVERRIDE;
 
  private:
   scoped_ptr<aura::RootWindow> root_window_;
 
   // Owned by RootWindow
   views::corewm::CompoundEventFilter* root_window_event_filter_;
 
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh);
+  DISALLOW_COPY_AND_ASSIGN(MinimalAsh);
 };
 
 }  // namespace content;
 
-#endif  // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
+#endif  // CONTENT_SHELL_MINIMAL_ASH_H_