Cleanup HistoryService and HistoryBackend interface

chrome/browser/history/android/android_provider_backend_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 "chrome/browser/history/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 271 matching lines @@
 
   // Add a bookmark which is not in the history.
   GURL url3("http://www.bookmark.com");
   base::string16 title3(UTF8ToUTF16("bookmark"));
   ASSERT_TRUE(bookmark_model_->AddURL(bookmark_model_->bookmark_bar_node(), 0,
                                       title3, url3));
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
-  history_backend = new HistoryBackend(
-      temp_dir_.path(), new AndroidProviderBackendDelegate(), history_client_);
+  history_backend =
+      new HistoryBackend(new AndroidProviderBackendDelegate(), history_client_);
   history_backend->Init(std::string(), false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.path()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
   URLRow url_row;
 
   ASSERT_TRUE(history_backend->GetURL(url1, &url_row));
   url_id1 = url_row.id();
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
@@ skipping 116 matching lines @@
   Time created2 = last_visited2 - TimeDelta::FromDays(10);
   visits2.push_back(VisitInfo(created2, ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5),
                               ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK));
 
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
-  history_backend = new HistoryBackend(
-      temp_dir_.path(), new AndroidProviderBackendDelegate(), history_client_);
+  history_backend =
+      new HistoryBackend(new AndroidProviderBackendDelegate(), history_client_);
   history_backend->Init(std::string(), false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.path()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
 
   history::URLRows url_rows(2u);
   ASSERT_TRUE(history_backend->GetURL(url1, &url_rows[0]));
   ASSERT_TRUE(history_backend->GetURL(url2, &url_rows[1]));
   url_rows[0].set_title(title1);
   url_rows[1].set_title(title2);
@@ skipping 1415 matching lines @@
   Time created2 = last_visited2 - TimeDelta::FromDays(10);
   visits2.push_back(VisitInfo(created2, ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5),
                               ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK));
 
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
-  history_backend = new HistoryBackend(
-      temp_dir_.path(), new AndroidProviderBackendDelegate(), history_client_);
+  history_backend =
+      new HistoryBackend(new AndroidProviderBackendDelegate(), history_client_);
   history_backend->Init(std::string(), false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.path()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
   URLRow url_row;
 
   history::URLRows url_rows(2u);
   ASSERT_TRUE(history_backend->GetURL(url1, &url_rows[0]));
   ASSERT_TRUE(history_backend->GetURL(url2, &url_rows[1]));
   url_rows[0].set_title(title1);
@@ skipping 269 matching lines @@
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(notifier_.deleted_details());
   ASSERT_TRUE(notifier_.modified_details());
   ASSERT_EQ(1u, notifier_.modified_details()->size());
   // No favicon will be updated as thumbnail database is missing.
   EXPECT_FALSE(notifier_.favicon_changed());
 }
 
 }  // namespace history