Revert of Componentize TemplateURLService

chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/search_engines/template_url.h"
-#include "components/search_engines/template_url_service.h"
 
 namespace {
 
 class TemplateURLServiceObserver {
  public:
   TemplateURLServiceObserver(TemplateURLService* service,
                              base::RunLoop* loop)
       : runner_(loop) {
     DCHECK(loop);
     template_url_sub_ = service->RegisterOnLoadedCallback(
@@ skipping 99 matching lines @@
   ASSERT_TRUE(extension);
   ASSERT_EQ(1u, extension->install_warnings().size());
   EXPECT_EQ(std::string(
                 "'chrome_settings_overrides' "
                 "is not allowed for specified platform."),
             extension->install_warnings().front().message);
 #endif
 }
 
 }  // namespace