Revert of Componentize TemplateURLService

chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

 // Copyright (c) 2012 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/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/search_engines/template_url.h"
-#include "components/search_engines/template_url_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/table_model_observer.h"
 
 using base::ASCIIToUTF16;
 
 static const base::string16 kA(ASCIIToUTF16("a"));
 static const base::string16 kA1(ASCIIToUTF16("a1"));
 static const base::string16 kB(ASCIIToUTF16("b"));
 static const base::string16 kB1(ASCIIToUTF16("b1"));
 
@@ skipping 227 matching lines @@
   TemplateURL* turl = new TemplateURL(data);
   util()->model()->Add(turl);
 
   // Table model should have updated.
   VerifyChangeCount(1, 0, 0, 0);
 
   // And should contain the newly added TemplateURL.
   ASSERT_EQ(original_row_count + 1, table_model()->RowCount());
   ASSERT_GE(table_model()->IndexOfTemplateURL(turl), 0);
 }