Stop using TemplateURLServiceTestUtil to initialize TemplateURLServiceFactory

chrome/browser/autocomplete/autocomplete_result_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/autocomplete/autocomplete_result.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 78 matching lines @@
     field_trial_list_.reset(new base::FieldTrialList(
         new metrics::SHA1EntropyProvider("foo")));
     chrome_variations::testing::ClearAllVariationParams();
   }
 
   virtual void SetUp() OVERRIDE {
 #if defined(OS_ANDROID)
     TemplateURLPrepopulateData::InitCountryCode(
         std::string() /* unknown country code */);
 #endif
-    test_util_.SetUp();
     test_util_.VerifyLoad();
   }
 
-  virtual void TearDown() OVERRIDE {
-    test_util_.TearDown();
-  }
-
   // Configures |match| from |data|.
   static void PopulateAutocompleteMatch(const TestData& data,
                                         AutocompleteMatch* match);
 
   // Adds |count| AutocompleteMatches to |matches|.
   static void PopulateAutocompleteMatches(const TestData* data,
                                           size_t count,
                                           ACMatches* matches);
 
   // Asserts that |result| has |expected_count| matches matching |expected|.
@@ skipping 737 matching lines @@
   result.Reset();
   matches.clear();
 
   // Case 5: Multiple verbatim matches found in AutocompleteResult.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches,
                                           arraysize(kVerbatimMatches),
                                           &matches);
   result.AppendMatches(matches);
   EXPECT_FALSE(result.ShouldHideTopMatch());
 }