Switch ChromeTestSuite to the same convention as ContentTestSuite:

chrome/test/base/browser_with_test_window_test.h

 // Copyright (c) 2011 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 CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #pragma once
 
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/test_browser_window.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class GURL;
 class NavigationController;
 
 // Base class for browser based unit tests. BrowserWithTestWindowTest creates a
 // Browser with a TestingProfile and TestBrowserWindow. To add a tab use
 // AddTestingTab. For example, the following adds a tab and navigates to
 // two URLs that target the TestTabContents:
 //
 //   // Add a new tab and navigate it. This will be at index 0.
 //   AddTab(browser(), GURL("http://foo/1"));
 //   NavigationController* controller =
 //       browser()->GetTabContentsAt(0)->controller();
 //
 //   // Navigate somewhere else.
 //   GURL url2("http://foo/2");
 //   NavigateAndCommit(controller, url2);
 //
 //   // This is equivalent to the above, and lets you test pending navigations.
 //   browser()->OpenURL(GURL("http://foo/2"), GURL(), CURRENT_TAB,
 //                      PageTransition::TYPED);
 //   CommitPendingLoadAsNewNavigation(controller, url2);
 //
 // Subclasses must invoke BrowserWithTestWindowTest::SetUp as it is responsible
 // for creating the various objects of this class.
-class BrowserWithTestWindowTest : public TestingBrowserProcessTest {
+class BrowserWithTestWindowTest : public testing::Test {
  public:
   BrowserWithTestWindowTest();
   virtual ~BrowserWithTestWindowTest();
 
   virtual void SetUp();
 
   // Returns the current RenderViewHost for the current tab as a
   // TestRenderViewHost.
   TestRenderViewHost* TestRenderViewHostForTab(TabContents* tab_contents);
 
@@ skipping 51 matching lines @@
   scoped_ptr<TestBrowserWindow> window_;
   scoped_ptr<Browser> browser_;
 
   MockRenderProcessHostFactory rph_factory_;
   TestRenderViewHostFactory rvh_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_