diff options
| author | yfriedman <yfriedman@chromium.org> | 2014-10-20 12:40:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-20 19:40:34 +0000 |
| commit | 38b46138112e7077a41ab8dd4815a22a15ff0527 (patch) | |
| tree | 671710b0ccf9b51c45cc10842a2802b438800a10 /components/omnibox/autocomplete_result_unittest.cc | |
| parent | 96a960536bdd4d6c6ceec62498a577f1c367ab73 (diff) | |
| download | chromium_src-38b46138112e7077a41ab8dd4815a22a15ff0527.zip chromium_src-38b46138112e7077a41ab8dd4815a22a15ff0527.tar.gz chromium_src-38b46138112e7077a41ab8dd4815a22a15ff0527.tar.bz2 | |
[Android] Simplify logic for grabbing initial country-code.
The old way involved start-up code reading a value and setting a global
in template_url_prepopulate_data. Since the value can be computed
on-demand from device-information, just fetch it as needed instead.
BUG=169106
TBR=thakis
Review URL: https://codereview.chromium.org/628263004
Cr-Commit-Position: refs/heads/master@{#300317}
Diffstat (limited to 'components/omnibox/autocomplete_result_unittest.cc')
| -rw-r--r-- | components/omnibox/autocomplete_result_unittest.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/components/omnibox/autocomplete_result_unittest.cc b/components/omnibox/autocomplete_result_unittest.cc index 24bdf77..534831e 100644 --- a/components/omnibox/autocomplete_result_unittest.cc +++ b/components/omnibox/autocomplete_result_unittest.cc @@ -18,7 +18,6 @@ #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" #include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" #include "components/variations/variations_associated_data.h" @@ -90,10 +89,6 @@ class AutocompleteResultTest : public testing::Test { } 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(); } |