Switch ChromeTestSuite to the same convention as ContentTestSuite:

chrome/browser/autofill/autofill_merge_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 <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/data_driven_test.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/test/base/testing_browser_process_test.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "webkit/glue/form_data.h"
 
 namespace {
 
 const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
 const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
 
@@ skipping 79 matching lines @@
   return profiles_.get();
 }
 
 }  // namespace
 
 // A data-driven test for verifying merging of Autofill profiles. Each input is
 // a structured dump of a set of implicitly detected autofill profiles. The
 // corresponding output file is a dump of the saved profiles that result from
 // importing the input profiles. The output file format is identical to the
 // input format.
-class AutofillMergeTest : public TestingBrowserProcessTest,
+class AutofillMergeTest : public testing::Test,
                           public DataDrivenTest {
  protected:
   AutofillMergeTest();
   virtual ~AutofillMergeTest();
 
   // testing::Test:
   virtual void SetUp();
 
   // DataDrivenTest:
   virtual void GenerateResults(const std::string& input,
@@ skipping 85 matching lines @@
     }
   }
 
   *merged_profiles = SerializeProfiles(personal_data_->web_profiles());
 }
 
 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }