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

chrome/browser/search_engines/search_provider_install_data_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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_provider_install_data.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/search_engines/search_terms_data.h"
 #include "components/search_engines/template_url.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 "content/public/browser/browser_thread.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 116 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SearchProviderInstallDataTest);
 };
 
 SearchProviderInstallDataTest::SearchProviderInstallDataTest()
     : install_data_(NULL) {
 }
 
 void SearchProviderInstallDataTest::SetUp() {
   testing::Test::SetUp();
-#if defined(OS_ANDROID)
-  TemplateURLPrepopulateData::InitCountryCode(
-      std::string() /* unknown country code */);
-#endif
   process_.reset(new content::MockRenderProcessHost(util_.profile()));
   install_data_ = new SearchProviderInstallData(
       util_.model(), SearchTermsData().GoogleBaseURLValue(), NULL,
       process_.get());
 }
 
 void SearchProviderInstallDataTest::TearDown() {
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, install_data_);
   install_data_ = NULL;
 
@@ skipping 104 matching lines @@
   // Verify the search providers install state (with no default set).
   test_get_install_state.RunTests(google_host, std::string());
 
   // Change the Google base url.
   google_host = "foo.com";
   SetGoogleBaseURLAndProcessOnIOThread(GURL("http://" + google_host + "/"));
 
   // Verify that the change got picked up.
   test_get_install_state.RunTests(google_host, std::string());
 }