chrome/browser/search_engines/template_url_service_test_util.cc - Issue 316963002: Move branding information out of google_util

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/template_url_service_test_util.cc

Issue 316963002: Move branding information out of google_util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for Windows Created 6 years, 6 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:

Index: chrome/browser/search_engines/template_url_service_test_util.cc

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

index eda84077599b82424ea52c6624f40e6b7a650f9d..3259ff30663170087765ea1947615ee983832018 100644

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

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

@@ -19,7 +19,7 @@

#include "testing/gtest/include/gtest/gtest.h"

#if defined(OS_CHROMEOS)

-#include "chrome/browser/google/google_util_chromeos.h"

+#include "chrome/browser/google/google_brand_chromeos.h"

#endif

// Trivial subclass of TemplateURLService that records the last invocation of

@@ -214,7 +214,7 @@ void TemplateURLServiceTestUtil::SetUp() {

TemplateURLServiceTestUtilBase::CreateTemplateUrlService();

#if defined(OS_CHROMEOS)

- google_util::chromeos::ClearBrandForCurrentSession();

+ google_brand::chromeos::ClearBrandForCurrentSession();

#endif

}