chrome/browser/ui/views/frame/test_with_browser_view.cc - Issue 369303002: Revert of Componentize TemplateURLService

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/ui/views/frame/test_with_browser_view.cc

Issue 369303002: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: chrome/browser/ui/views/frame/test_with_browser_view.cc

diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc

index cea603ff2a31126df4625a4b2956143aa418c197..6e3e78e21c981670098588205cc78485a01066cc 100644

--- a/chrome/browser/ui/views/frame/test_with_browser_view.cc

+++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc

@@ -9,6 +9,7 @@

#include "chrome/browser/autocomplete/autocomplete_controller.h"

#include "chrome/browser/predictors/predictor_database.h"

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

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

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

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

@@ -20,7 +21,6 @@

#include "chrome/test/base/testing_io_thread_state.h"

#include "components/autocomplete/test_scheme_classifier.h"

#include "components/search_engines/search_terms_data.h"

-#include "components/search_engines/template_url_service.h"

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

#if defined(OS_CHROMEOS)