[Android] Simplify logic for grabbing initial country-code.

components/omnibox/autocomplete_result_unittest.cc

 // Copyright 2014 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 "components/omnibox/autocomplete_result.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_match_type.h"
 #include "components/omnibox/autocomplete_provider.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/omnibox/test_scheme_classifier.h"
 #include "components/search_engines/template_url_prepopulate_data.h"

[Peter Kasting, 2014/10/06 20:28:27]

This #include can probably be removed.

[Yaron, 2014/10/08 00:08:54]

Done.

 #include "components/search_engines/template_url_service.h"
 #include "components/variations/entropy_provider.h"
 #include "components/variations/variations_associated_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using metrics::OmniboxEventProto;
 
 namespace {
 
 struct AutocompleteMatchTestData {
@@ skipping 51 matching lines @@
   AutocompleteResultTest() {
     // Destroy the existing FieldTrialList before creating a new one to avoid
     // a DCHECK.
     field_trial_list_.reset();
     field_trial_list_.reset(new base::FieldTrialList(
         new metrics::SHA1EntropyProvider("foo")));
     variations::testing::ClearAllVariationParams();
   }
 
   virtual void SetUp() override {
-#if defined(OS_ANDROID)
-    TemplateURLPrepopulateData::InitCountryCode(
-        std::string() /* unknown country code */);
-#endif
     template_url_service_.reset(new TemplateURLService(NULL, 0));
     template_url_service_->Load();
   }
 
   // Configures |match| from |data|.
   static void PopulateAutocompleteMatch(const TestData& data,
                                         AutocompleteMatch* match);
 
   // Adds |count| AutocompleteMatches to |matches|.
   static void PopulateAutocompleteMatches(const TestData* data,
@@ skipping 727 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());
 }