Cleanup HistoryService and HistoryBackend interface

chrome/browser/history/history_service.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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 13 matching lines @@
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_url_index.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/history/core/browser/download_row.h"
 #include "components/history/core/browser/history_client.h"
 #include "components/history/core/browser/history_database_params.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/in_memory_database.h"
 #include "components/history/core/browser/keyword_search_term.h"
 #include "components/history/core/browser/visit_database.h"
@@ skipping 142 matching lines @@
   const scoped_refptr<base::SequencedTaskRunner> service_task_runner_;
 };
 
 // The history thread is intentionally not a BrowserThread because the
 // sync integration unit tests depend on being able to create more than one
 // history thread.
 HistoryService::HistoryService()
     : thread_(new base::Thread(kHistoryThreadName)),
       history_client_(nullptr),
       backend_loaded_(false),
-      no_db_(false),
       weak_ptr_factory_(this) {
 }
 
 HistoryService::HistoryService(
     history::HistoryClient* history_client,
     scoped_ptr<history::VisitDelegate> visit_delegate)
     : thread_(new base::Thread(kHistoryThreadName)),
       visit_delegate_(visit_delegate.Pass()),
       history_client_(history_client),
       backend_loaded_(false),
-      no_db_(false),
       weak_ptr_factory_(this) {
 }
 
 HistoryService::~HistoryService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Shutdown the backend. This does nothing if Cleanup was already invoked.
   Cleanup();
 }
 
 bool HistoryService::BackendLoaded() {
@@ skipping 713 matching lines @@
     const history::HistoryDatabaseParams& history_database_params) {
   DCHECK(thread_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   base::Thread::Options options;
   options.timer_slack = base::TIMER_SLACK_MAXIMUM;
   if (!thread_->StartWithOptions(options)) {
     Cleanup();
     return false;
   }
 
-  history_dir_ = history_database_params.history_dir;
-  no_db_ = no_db;
-
   if (!languages.empty()) {
     // Do not create |in_memory_url_index_| when languages is empty (which
     // should only happens during testing).
-    in_memory_url_index_.reset(
-        new history::InMemoryURLIndex(this, history_dir_, languages));
+    in_memory_url_index_.reset(new history::InMemoryURLIndex(
+        this, history_database_params.history_dir, languages));
     in_memory_url_index_->Init();
   }
 
   // Create the history backend.
   scoped_refptr<HistoryBackend> backend(new HistoryBackend(
-      history_dir_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr(),
-                                        base::ThreadTaskRunnerHandle::Get()),
+      new BackendDelegate(weak_ptr_factory_.GetWeakPtr(),
+                          base::ThreadTaskRunnerHandle::Get()),
       history_client_));
   history_backend_.swap(backend);
 
   ScheduleTask(PRIORITY_UI,
                base::Bind(&HistoryBackend::Init, history_backend_.get(),
-                          languages, no_db_, history_database_params));
+                          languages, no_db, history_database_params));
 
   if (visit_delegate_ && !visit_delegate_->Init(this))
     return false;
 
   return true;
 }
 
 void HistoryService::ScheduleAutocomplete(const base::Callback<
     void(history::HistoryBackend*, history::URLDatabase*)>& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 272 matching lines @@
     const HistoryService::OnFaviconChangedCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   return favicon_changed_callback_list_.Add(callback);
 }
 
 void HistoryService::NotifyFaviconChanged(
     const std::set<GURL>& changed_favicons) {
   DCHECK(thread_checker_.CalledOnValidThread());
   favicon_changed_callback_list_.Notify(changed_favicons);
 }