Move TemplateURLService related tests to components/search_engines

chrome/browser/search_engines/search_provider_install_data_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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_provider_install_data.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/search_engines/search_terms_data.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/test/mock_render_process_host.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // TestGetInstallState --------------------------------------------------------
 
 // Test the SearchProviderInstallData::GetInstallState.
 class TestGetInstallState {
@@ skipping 89 matching lines @@
   virtual void TearDown() OVERRIDE;
 
  protected:
   TemplateURL* AddNewTemplateURL(const std::string& url,
                                  const base::string16& keyword);
 
   // Sets the Google base URL to |base_url| and runs the IO thread for
   // |SearchProviderInstallData| to process the update.
   void SetGoogleBaseURLAndProcessOnIOThread(GURL base_url);
 
+  content::TestBrowserThreadBundle thread_bundle_;

[Peter Kasting, 2014/08/28 19:06:19]

Nit: Add comments about why we need this.

While here, try to make these data members private instead of protected where
possible.

[hashimoto, 2014/08/29 08:06:26]

Added comments and made all data members private.

   TemplateURLServiceTestUtil util_;
 
   // Provides the search provider install state on the I/O thread. It must be
   // deleted on the I/O thread, which is why it isn't a scoped_ptr.
   SearchProviderInstallData* install_data_;
 
   // A mock RenderProcessHost that the SearchProviderInstallData will scope its
   // lifetime to.
   scoped_ptr<content::MockRenderProcessHost> process_;
 
@@ skipping 127 matching lines @@
   // Verify the search providers install state (with no default set).
   test_get_install_state.RunTests(google_host, std::string());
 
   // Change the Google base url.
   google_host = "foo.com";
   SetGoogleBaseURLAndProcessOnIOThread(GURL("http://" + google_host + "/"));
 
   // Verify that the change got picked up.
   test_get_install_state.RunTests(google_host, std::string());
 }