chrome/browser/search_engines/search_provider_install_data_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: chrome/browser/search_engines/search_provider_install_data_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/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc ('k') | components/omnibox/autocomplete_result_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/search_provider_install_data_unittest.cc

diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc

index c26e3a0084d2e5617d83bcc48da410e8fda09794..017a7c59b659630813ba5525dee4225301c03c0c 100644

--- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc

+++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc

@@ -17,7 +17,6 @@

#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"

#include "components/search_engines/template_url_service.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/test/mock_render_process_host.h"

@@ -154,10 +153,6 @@ SearchProviderInstallDataTest::SearchProviderInstallDataTest()

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,