Componentize HistoryDatabase

components/history/core/browser/history_database.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_DATABASE_H_
-#define CHROME_BROWSER_HISTORY_HISTORY_DATABASE_H_
+#ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_DATABASE_H_
+#define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_DATABASE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 #include "components/history/core/browser/download_database.h"
 #include "components/history/core/browser/url_database.h"
 #include "components/history/core/browser/visit_database.h"
 #include "components/history/core/browser/visitsegment_database.h"
 #include "sql/connection.h"
 #include "sql/init_status.h"
 #include "sql/meta_table.h"
 
 #if defined(OS_ANDROID)
-#include "components/history/core/android/android_cache_database.h"
-#include "components/history/core/android/android_urls_database.h"
+#include "components/history/core/browser/android/android_cache_database.h"
+#include "components/history/core/browser/android/android_urls_database.h"
 #endif
 
 namespace base {
 class FilePath;
 }
 
 class HistoryQuickProviderTest;
 
 namespace history {
 
@@ skipping 13 matching lines @@
                         public VisitDatabase,
                         public VisitSegmentDatabase {
  public:
   // A simple class for scoping a history database transaction. This does not
   // support rollback since the history database doesn't, either.
   class TransactionScoper {
    public:
     explicit TransactionScoper(HistoryDatabase* db) : db_(db) {
       db_->BeginTransaction();
     }
-    ~TransactionScoper() {
-      db_->CommitTransaction();
-    }
+    ~TransactionScoper() { db_->CommitTransaction(); }
+
    private:
     HistoryDatabase* db_;
   };
 
   // Must call Init() to complete construction. Although it can be created on
   // any thread, it must be destructed on the history thread for proper
   // database cleanup.
-  HistoryDatabase();
+  HistoryDatabase(DownloadInterruptReason download_interrupt_reason_none,
+                  DownloadInterruptReason download_interrupt_reason_crash);
 
   ~HistoryDatabase() override;
 
   // Call before Init() to set the error callback to be used for the
   // underlying database connection.
   void set_error_callback(
       const sql::Connection::ErrorCallback& error_callback) {
     error_callback_ = error_callback;
   }
 
@@ skipping 109 matching lines @@
   sql::Connection db_;
   sql::MetaTable meta_table_;
 
   base::Time cached_early_expiration_threshold_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryDatabase);
 };
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_HISTORY_HISTORY_DATABASE_H_
+#endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_DATABASE_H_