Cleanup HistoryService and HistoryBackend interface

chrome/browser/history/history_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 15 matching lines @@
 #include "chrome/browser/history/delete_directive_handler.h"
 #include "chrome/browser/history/typed_url_syncable_service.h"
 #include "components/favicon_base/favicon_callback.h"
 #include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/keyword_id.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "sql/init_status.h"
 #include "sync/api/syncable_service.h"
 #include "ui/base/page_transition_types.h"
 
-#if defined(OS_ANDROID)
-class AndroidHistoryProviderService;
-#endif
-
 class GURL;
 class PageUsageRequest;
 class SkBitmap;
 
 namespace base {
 class FilePath;
 class Thread;
 }
 
 namespace history {
@@ skipping 24 matching lines @@
 // (eventually) information about autocomplete.
 //
 // This service is thread safe. Each request callback is invoked in the
 // thread that made the request.
 class HistoryService : public syncer::SyncableService, public KeyedService {
  public:
   // Miscellaneous commonly-used types.
   typedef std::vector<history::PageUsageData*> PageUsageDataList;
 
   // Must call Init after construction. The empty constructor provided only for
-  // unit tests. When using the full constructor, |history_client| and |profile|
-  // should only be null during testing, while |visit_delegate| may be null if
-  // the embedder use another way to track visited links.
+  // unit tests. When using the full constructor, |history_client| may only be
+  // null during testing, while |visit_delegate| may be null if the embedder use
+  // another way to track visited links.
   HistoryService();
   HistoryService(history::HistoryClient* history_client,
                  scoped_ptr<history::VisitDelegate> visit_delegate);
   ~HistoryService() override;
 
   // Initializes the history service, returning true on success. On false, do
   // not call any other functions. The given directory will be used for storing
   // the history files. |languages| is a comma-separated list of languages to
   // use when interpreting URLs, it must not be empty (except during testing).
   bool Init(const std::string& languages,
@@ skipping 707 matching lines @@
   scoped_ptr<history::VisitDelegate> visit_delegate_;
 
   // The history client, may be null when testing. The object should otherwise
   // outlive |HistoryService|.
   history::HistoryClient* history_client_;
 
   // Has the backend finished loading? The backend is loaded once Init has
   // completed.
   bool backend_loaded_;
 
-  // Cached values from Init(), used whenever we need to reload the backend.
-  base::FilePath history_dir_;
-  bool no_db_;
-
   // The index used for quick history lookups.
   // TODO(mrossetti): Move in_memory_url_index out of history_service.
   // See http://crbug.com/138321
   scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
 
   ObserverList<history::HistoryServiceObserver> observers_;
   base::CallbackList<void(const std::set<GURL>&)>
       favicon_changed_callback_list_;
 
   history::DeleteDirectiveHandler delete_directive_handler_;
 
   // All vended weak pointers are invalidated in Cleanup().
   base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_