chrome/browser/search_engines/search_provider_install_data_unittest.cc - Issue 10697087: Remove content->app dependency in template_url_prepopulate_data.cc.

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 10697087: Remove content->app dependency in template_url_prepopulate_data.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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 | « no previous file | chrome/browser/search_engines/template_url_prepopulate_data.h » ('j') | chrome/browser/search_engines/template_url_prepopulate_data.cc » ('J')
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 18c6548c2c8db4760e16fd6f550f9df90510cc8b..df75f9c9716608f6e378a81f2f51cc4eff9b440d 100644

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

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

@@ -11,6 +11,7 @@

#include "base/utf_string_conversions.h"

#include "chrome/browser/search_engines/search_provider_install_data.h"

#include "chrome/browser/search_engines/template_url.h"

+#include "chrome/browser/search_engines/template_url_prepopulate_data.h"

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_test_util.h"

#include "chrome/common/chrome_notification_types.h"

@@ -187,6 +188,10 @@ SearchProviderInstallDataTest::SearchProviderInstallDataTest()

void SearchProviderInstallDataTest::SetUp() {

testing::Test::SetUp();

+#if defined(OS_ANDROID)

+ TemplateURLPrepopulateData::InitCountryCode(

+ std::string() /* unknown country code */);

+#endif

util_.SetUp();

util_.StartIOThread();

install_data_ = new SearchProviderInstallData(util_.profile(),