GTTF: Move TerminateBrowser function from UITestBase into UITest.

BUG=56865
TEST=trybots

Review URL: http://codereview.chromium.org/6312018

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

2 files changed, 23 insertions, 25 deletions

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 28981ab..bab8404 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -220,10 +220,6 @@ void UITestBase::QuitBrowser() {
   launcher_->QuitBrowser(shutdown_type_);
 }
 
-void UITestBase::TerminateBrowser() {
-  launcher_->TerminateBrowser();
-}
-
 void UITestBase::CleanupAppProcesses() {
   TerminateAllChromeProcesses(browser_process_id());
 }
@@ -817,6 +813,10 @@ bool UITest::WaitForFindWindowVisibilityChange(BrowserProxy* browser,
   return false;
 }
 
+void UITest::TerminateBrowser() {
+  launcher_->TerminateBrowser();
+}
+
 bool UITest::WaitForDownloadShelfVisibilityChange(BrowserProxy* browser,
                                                   bool wait_for_open) {
   const int kCycles = 10;
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 3e31735..34f9f94 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -48,24 +48,6 @@ class TabProxy;
 // If using gtest, you probably want to inherit from UITest (declared below)
 // rather than UITestBase.
 class UITestBase {
- protected:
-  // String to display when a test fails because the crash service isn't
-  // running.
-  static const wchar_t kFailedNoCrashService[];
-
-  // Constructor
-  UITestBase();
-  explicit UITestBase(MessageLoop::Type msg_loop_type);
-
-  virtual ~UITestBase();
-
-  // Starts the browser using the arguments in launch_arguments_, and
-  // sets up member variables.
-  virtual void SetUp();
-
-  // Closes the browser window.
-  virtual void TearDown();
-
  public:
   // ********* Utility functions *********
 
@@ -107,9 +89,6 @@ class UITestBase {
   // Exits out browser instance.
   void QuitBrowser();
 
-  // Terminates the browser, simulates end of session.
-  void TerminateBrowser();
-
   // Tells the browser to navigate to the given URL in the active tab
   // of the first app window.
   // Does not wait for the navigation to complete to return.
@@ -282,6 +261,22 @@ class UITestBase {
   void SetBrowserDirectory(const FilePath& dir);
 
  protected:
+  // String to display when a test fails because the crash service isn't
+  // running.
+  static const wchar_t kFailedNoCrashService[];
+
+  UITestBase();
+  explicit UITestBase(MessageLoop::Type msg_loop_type);
+
+  virtual ~UITestBase();
+
+  // Starts the browser using the arguments in launch_arguments_, and
+  // sets up member variables.
+  virtual void SetUp();
+
+  // Closes the browser window.
+  virtual void TearDown();
+
   AutomationProxy* automation() const {
     return launcher_->automation();
   }
@@ -486,6 +481,9 @@ class UITest : public UITestBase, public PlatformTest {
   bool WaitForFindWindowVisibilityChange(BrowserProxy* browser,
                                          bool wait_for_open);
 
+  // Terminates the browser, simulates end of session.
+  void TerminateBrowser();
+
  private:
   // Waits for download shelf visibility or invisibility.
   bool WaitForDownloadShelfVisibilityChange(BrowserProxy* browser,