Remove NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/search_engines/template_url_service_test_util.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 "chrome/browser/search_engines/template_url_service_test_util.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/search_engines/chrome_template_url_service_client.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/search_engines/default_search_pref_test_util.h"
 #include "components/search_engines/keyword_table.h"
 #include "components/search_engines/keyword_web_data_service.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/testing_search_terms_data.h"
 #include "components/webdata/common/web_database_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class TestingTemplateURLServiceClient : public ChromeTemplateURLServiceClient {
  public:
-  TestingTemplateURLServiceClient(Profile* profile,
+  TestingTemplateURLServiceClient(HistoryService* history_service,
                                   base::string16* search_term)
-      : ChromeTemplateURLServiceClient(profile),
+      : ChromeTemplateURLServiceClient(history_service),
         search_term_(search_term) {}
 
   virtual void SetKeywordSearchTermsForURL(
       const GURL& url,
       TemplateURLID id,
       const base::string16& term) override {
     *search_term_ = term;
   }
 
  private:
@@ skipping 67 matching lines @@
 void TemplateURLServiceTestUtil::ClearModel() {
   model_->Shutdown();
   model_.reset();
   search_terms_data_ = NULL;
 }
 
 void TemplateURLServiceTestUtil::ResetModel(bool verify_load) {
   if (model_)
     ClearModel();
   search_terms_data_ = new TestingSearchTermsData("http://www.google.com/");
+  DCHECK(profile()->CreateHistoryService(false, false));

[droger, 2014/10/14 15:15:24]

Is it OK if this code is not called in release?

Or did you mean instead:
bool created = profile()->CreateHistoryService(false, false);
DCHECK(created);

[sdefresne, 2014/10/14 16:02:05]

Done.

   model_.reset(new TemplateURLService(
       profile()->GetPrefs(), scoped_ptr<SearchTermsData>(search_terms_data_),
       web_data_service_.get(),
       scoped_ptr<TemplateURLServiceClient>(
-          new TestingTemplateURLServiceClient(profile(), &search_term_)),
+          new TestingTemplateURLServiceClient(
+              HistoryServiceFactory::GetForProfile(profile(),
+                                                   Profile::EXPLICIT_ACCESS),
+              &search_term_)),
       NULL, NULL, base::Closure()));
   model()->AddObserver(this);
   changed_count_ = 0;
   if (verify_load)
     VerifyLoad();
 }
 
 base::string16 TemplateURLServiceTestUtil::GetAndClearSearchTerm() {
   base::string16 search_term;
   search_term.swap(search_term_);
@@ skipping 19 matching lines @@
   DefaultSearchPrefTestUtil::SetManagedPref(
       profile()->GetTestingPrefService(),
       enabled, name, keyword, search_url, suggest_url, icon_url, encodings,
       alternate_url, search_terms_replacement_key);
 }
 
 void TemplateURLServiceTestUtil::RemoveManagedDefaultSearchPreferences() {
   DefaultSearchPrefTestUtil::RemoveManagedPref(
       profile()->GetTestingPrefService());
 }