components/omnibox/autocomplete_result_unittest.cc - Issue 628263004: [Android] Simplify logic for grabbing initial country-code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/omnibox/autocomplete_result_unittest.cc

Issue 628263004: [Android] Simplify logic for grabbing initial country-code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/search_engines/search_provider_install_data_unittest.cc ('k') | components/search_engines/DEPS » ('j') | ui/base/l10n/l10n_util_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/omnibox/autocomplete_result_unittest.cc

diff --git a/components/omnibox/autocomplete_result_unittest.cc b/components/omnibox/autocomplete_result_unittest.cc

index 46928497a5d62e4d87f549464995916fa418bfe6..0cafbe731dbcf3738fc8ef8e70bef2345e0bee87 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();

}