Changes to make content_browsertests build with USE_OZONE=1

BUG=251046

Review URL: https://chromiumcodereview.appspot.com/19737004

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

6 files changed, 25 insertions, 25 deletions

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 8bfba6f..129c2a2 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -85,8 +85,8 @@
         'shell/common/webkit_test_helpers.h',
         'shell/geolocation/shell_access_token_store.cc',
         'shell/geolocation/shell_access_token_store.h',
-        'shell/minimal_ash.cc',
-        'shell/minimal_ash.h',
+        'shell/minimal_shell.cc',
+        'shell/minimal_shell.h',
         'shell/notify_done_forwarder.cc',
         'shell/notify_done_forwarder.h',
         'shell/renderer/shell_content_renderer_client.cc',
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 70adacc..5e8e0c6 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -226,7 +226,7 @@ class RenderViewImplTest : public RenderViewTest {
                                      flags);
     output->assign(1, static_cast<char16>(c));
     return 1;
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_GTK)
     // We ignore |layout|, which means we are only testing the layout of the
     // current locale. TODO(estade): fix this to respect |layout|.
     std::vector<GdkEvent*> events;
diff --git a/content/shell/minimal_ash.cc b/content/shell/minimal_shell.cc
index fdecda2..2e9079e 100644
--- a/content/shell/minimal_ash.cc
+++ b/content/shell/minimal_shell.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 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 "content/shell/minimal_ash.h"
+#include "content/shell/minimal_shell.h"
 
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/focus_manager.h"
@@ -13,7 +13,7 @@
 
 namespace content {
 
-MinimalAsh::MinimalAsh(const gfx::Size& default_window_size) {
+MinimalShell::MinimalShell(const gfx::Size& default_window_size) {
   root_window_.reset(new aura::RootWindow(
       aura::RootWindow::CreateParams(
           gfx::Rect(default_window_size))));
@@ -40,11 +40,11 @@ MinimalAsh::MinimalAsh(const gfx::Size& default_window_size) {
       new aura::client::DefaultCaptureClient(root_window_.get()));
 }
 
-MinimalAsh::~MinimalAsh() {
+MinimalShell::~MinimalShell() {
   root_window_event_filter_->RemoveHandler(input_method_filter_.get());
 }
 
-aura::Window* MinimalAsh::GetDefaultParent(
+aura::Window* MinimalShell::GetDefaultParent(
     aura::Window* context,
     aura::Window* window,
     const gfx::Rect& bounds) {
diff --git a/content/shell/minimal_ash.h b/content/shell/minimal_shell.h
index a417891..b2ab9eb 100644
--- a/content/shell/minimal_ash.h
+++ b/content/shell/minimal_shell.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 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.
 
-#ifndef CONTENT_SHELL_MINIMAL_ASH_H_
-#define CONTENT_SHELL_MINIMAL_ASH_H_
+#ifndef CONTENT_SHELL_MINIMAL_SHELL_H_
+#define CONTENT_SHELL_MINIMAL_SHELL_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -38,10 +38,10 @@ 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 MinimalAsh : public aura::client::StackingClient {
+class MinimalShell : public aura::client::StackingClient {
  public:
-  explicit MinimalAsh(const gfx::Size& default_window_size);
-  virtual ~MinimalAsh();
+  explicit MinimalShell(const gfx::Size& default_window_size);
+  virtual ~MinimalShell();
 
   // Overridden from client::StackingClient:
   virtual aura::Window* GetDefaultParent(aura::Window* context,
@@ -59,9 +59,9 @@ class MinimalAsh : public aura::client::StackingClient {
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(MinimalAsh);
+  DISALLOW_COPY_AND_ASSIGN(MinimalShell);
 };
 
 }  // namespace content;
 
-#endif  // CONTENT_SHELL_MINIMAL_ASH_H_
+#endif  // CONTENT_SHELL_MINIMAL_SHELL_H_
diff --git a/content/shell/shell.h b/content/shell/shell.h
index 911902e..00fcdf9 100644
--- a/content/shell/shell.h
+++ b/content/shell/shell.h
@@ -28,7 +28,7 @@ typedef struct _GtkToolItem GtkToolItem;
 #elif defined(USE_AURA)
 #if defined(OS_CHROMEOS)
 namespace content {
-class MinimalAsh;
+class MinimalShell;
 }
 #endif
 namespace views {
@@ -257,7 +257,7 @@ class Shell : public WebContentsDelegate,
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
 #elif defined(USE_AURA)
 #if defined(OS_CHROMEOS)
-  static content::MinimalAsh* minimal_ash_;
+  static content::MinimalShell* minimal_shell_;
 #endif
   static views::ViewsDelegate* views_delegate_;
 
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc
index 9552f91..b7bf5d0 100644
--- a/content/shell/shell_aura.cc
+++ b/content/shell/shell_aura.cc
@@ -30,7 +30,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "content/shell/minimal_ash.h"
+#include "content/shell/minimal_shell.h"
 #include "ui/aura/test/test_screen.h"
 #endif
 
@@ -273,7 +273,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
 }  // namespace
 
 #if defined(OS_CHROMEOS)
-MinimalAsh* Shell::minimal_ash_ = NULL;
+MinimalShell* Shell::minimal_shell_ = NULL;
 #endif
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
@@ -283,7 +283,7 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   chromeos::DBusThreadManager::Initialize();
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
-  minimal_ash_ = new content::MinimalAsh(default_window_size);
+  minimal_shell_ = new content::MinimalShell(default_window_size);
 #else
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
@@ -293,8 +293,8 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
 
 void Shell::PlatformExit() {
 #if defined(OS_CHROMEOS)
-  if (minimal_ash_)
-    delete minimal_ash_;
+  if (minimal_shell_)
+    delete minimal_shell_;
 #endif
   if (views_delegate_)
     delete views_delegate_;
@@ -336,7 +336,7 @@ void Shell::PlatformCreateWindow(int width, int height) {
   window_widget_ =
       views::Widget::CreateWindowWithContextAndBounds(
           new ShellWindowDelegateView(this),
-          minimal_ash_->GetDefaultParent(NULL, NULL, gfx::Rect()),
+          minimal_shell_->GetDefaultParent(NULL, NULL, gfx::Rect()),
           gfx::Rect(0, 0, width, height));
 #else
   window_widget_ =
@@ -345,7 +345,7 @@ void Shell::PlatformCreateWindow(int width, int height) {
 #endif
 
   window_ = window_widget_->GetNativeWindow();
-  // Call ShowRootWindow on RootWindow created by MinimalAsh without
+  // Call ShowRootWindow on RootWindow created by MinimalShell without
   // which XWindow owned by RootWindow doesn't get mapped.
   window_->GetRootWindow()->ShowRootWindow();
   window_widget_->Show();