Convert a bunch of AuraTestBase users to AshTestBase.

http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9522012

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

4 files changed, 39 insertions, 2 deletions

diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index c562330..8b0f23e 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -26,7 +26,11 @@ void AshTestBase::SetUp() {
   helper_.SetUp();
 
   // Creates Shell and hook with Desktop.
-  ash::Shell::CreateInstance(new TestShellDelegate);
+  TestShellDelegate* delegate = new TestShellDelegate;
+  Shell::WindowMode window_mode = Shell::MODE_OVERLAPPING;
+  if (GetOverrideWindowMode(&window_mode))
+    delegate->SetOverrideWindowMode(window_mode);
+  ash::Shell::CreateInstance(delegate);
 
   // Disable animations during tests.
   ui::LayerAnimator::set_disable_animations_for_test(true);
@@ -42,6 +46,10 @@ void AshTestBase::TearDown() {
   helper_.TearDown();
 }
 
+bool AshTestBase::GetOverrideWindowMode(Shell::WindowMode* window_mode) {
+  return false;
+}
+
 void AshTestBase::RunAllPendingInMessageLoop() {
   helper_.RunAllPendingInMessageLoop(Shell::GetRootWindow());
 }
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index ef9c187..85a1f35 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -6,6 +6,7 @@
 #define ASH_TEST_ASH_TEST_BASE_H_
 #pragma once
 
+#include "ash/shell.h"
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_helper.h"
@@ -23,6 +24,9 @@ class AshTestBase : public testing::Test {
   virtual void TearDown() OVERRIDE;
 
  protected:
+  // Overridden by test cases to specify what window mode to run the shell in.
+  virtual bool GetOverrideWindowMode(Shell::WindowMode* window_mode);
+
   void RunAllPendingInMessageLoop();
 
  private:
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 719bd44..883f073 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -15,12 +15,19 @@
 namespace ash {
 namespace test {
 
-TestShellDelegate::TestShellDelegate() {
+TestShellDelegate::TestShellDelegate()
+    : override_window_mode_(false),
+      window_mode_(Shell::MODE_OVERLAPPING) {
 }
 
 TestShellDelegate::~TestShellDelegate() {
 }
 
+void TestShellDelegate::SetOverrideWindowMode(Shell::WindowMode window_mode) {
+  override_window_mode_ = true;
+  window_mode_ = window_mode;
+}
+
 views::Widget* TestShellDelegate::CreateStatusArea() {
   return NULL;
 }
@@ -70,5 +77,14 @@ SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
     SystemTray* tray) {
   return NULL;
 }
+
+bool TestShellDelegate::GetOverrideWindowMode(Shell::WindowMode* window_mode) {
+  if (override_window_mode_) {
+    *window_mode = window_mode_;
+    return true;
+  }
+  return false;
+}
+
 }  // namespace test
 }  // namespace ash
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 1a621fd..9455da0 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -17,6 +17,8 @@ class TestShellDelegate : public ShellDelegate {
   TestShellDelegate();
   virtual ~TestShellDelegate();
 
+  void SetOverrideWindowMode(Shell::WindowMode window_mode);
+
   // Overridden from ShellDelegate:
   virtual views::Widget* CreateStatusArea() OVERRIDE;
 #if defined(OS_CHROMEOS)
@@ -33,6 +35,13 @@ class TestShellDelegate : public ShellDelegate {
   virtual LauncherDelegate* CreateLauncherDelegate(
       ash::LauncherModel* model) OVERRIDE;
   virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;
+  virtual bool GetOverrideWindowMode(Shell::WindowMode* window_mode) OVERRIDE;
+
+ private:
+  bool override_window_mode_;
+  Shell::WindowMode window_mode_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
 };
 
 }  // namespace test