Switch ChromeTestSuite to the same convention as ContentTestSuite:

chrome/browser/autocomplete/history_contents_provider_unittest.cc

 // 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.
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 struct TestEntry {
   const char* url;
   const char* title;
   const char* body;
 } test_entries[] = {
   {"http://www.google.com/1", "PAGEONE 1",   "FOO some body text"},
   {"http://www.google.com/2", "PAGEONE 2",   "FOO some more blah blah"},
   {"http://www.google.com/3", "PAGETHREE 3", "BAR some hello world for you"},
 };
 
-class HistoryContentsProviderTest : public TestingBrowserProcessTest,
+class HistoryContentsProviderTest : public testing::Test,
                                     public ACProviderListener {
  public:
   HistoryContentsProviderTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_) {}
 
   void RunQuery(const AutocompleteInput& input,
                 bool minimal_changes) {
     provider_->Start(input, minimal_changes);
 
@@ skipping 225 matching lines @@
                               true, AutocompleteInput::ALL_MATCHES);
   RunQuery(you_input, false);
   EXPECT_EQ(0U, matches().size());
 
   // Run a query that matches the bookmark
   RunQuery(input, false);
   EXPECT_EQ(1U, matches().size());
 }
 
 }  // namespace