Abstract history dependencies on bookmarks through HistoryClient

chrome/browser/history/expire_history_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 <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
+#include "components/history/core/test/history_client_fake_bookmarks.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 using content::BrowserThread;
 
 // Filename constants.
 static const base::FilePath::CharType kHistoryFile[] =
     FILE_PATH_LITERAL("History");
 static const base::FilePath::CharType kArchivedHistoryFile[] =
     FILE_PATH_LITERAL("Archived History");
 static const base::FilePath::CharType kThumbnailFile[] =
     FILE_PATH_LITERAL("Thumbnails");
 
 // The test must be in the history namespace for the gtest forward declarations
 // to work. It also eliminates a bunch of ugly "history::".
 namespace history {
 
 // ExpireHistoryTest -----------------------------------------------------------
 
 class ExpireHistoryTest : public testing::Test,
                           public BroadcastNotificationDelegate {
  public:
   ExpireHistoryTest()
-      : bookmark_model_(bookmark_client_.CreateModel(false)),
-        ui_thread_(BrowserThread::UI, &message_loop_),
+      : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB, &message_loop_),
-        expirer_(this, bookmark_model_.get()),
+        expirer_(this, &history_client_),
         now_(Time::Now()) {}
 
  protected:
   // Called by individual tests when they want data populated.
   void AddExampleData(URLID url_ids[3], Time visit_times[4]);
   // Add visits with source information.
   void AddExampleSourceData(const GURL& url, URLID* id);
 
   // Returns true if the given favicon/thumanil has an entry in the DB.
   bool HasFavicon(favicon_base::FaviconID favicon_id);
   bool HasThumbnail(URLID url_id);
 
   favicon_base::FaviconID GetFavicon(const GURL& page_url,
                                      favicon_base::IconType icon_type);
 
   // EXPECTs that each URL-specific history thing (basically, everything but
   // favicons) is gone, the reason being either that it was |archived|, or
   // manually deleted.
   void EnsureURLInfoGone(const URLRow& row, bool archived);
 
   // Returns whether a NOTIFICATION_HISTORY_URLS_MODIFIED was sent for |url|.
   bool ModifiedNotificationSent(const GURL& url);
 
   // Clears the list of notifications received.
   void ClearLastNotifications() {
     STLDeleteValues(&notifications_);
   }
 
-  void StarURL(const GURL& url) {
-    bookmark_model_->AddURL(
-        bookmark_model_->bookmark_bar_node(), 0, base::string16(), url);
-  }
+  void StarURL(const GURL& url) { history_client_.AddBookmark(url); }
 
   static bool IsStringInFile(const base::FilePath& filename, const char* str);
 
   // Returns the path the db files are created in.
   const base::FilePath& path() const { return tmp_dir_.path(); }
 
   // This must be destroyed last.
   base::ScopedTempDir tmp_dir_;
 
-  test::TestBookmarkClient bookmark_client_;
-  scoped_ptr<BookmarkModel> bookmark_model_;
+  HistoryClientFakeBookmarks history_client_;
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
 
   ExpireHistoryBackend expirer_;
 
   scoped_ptr<HistoryDatabase> main_db_;
   scoped_ptr<ArchivedDatabase> archived_db_;
   scoped_ptr<ThumbnailDatabase> thumb_db_;
@@ skipping 397 matching lines @@
   // And no visits.
   VisitVector visits;
   main_db_->GetVisitsForURL(url_row.id(), &visits);
   ASSERT_EQ(0U, visits.size());
 
   // Should still have the thumbnail.
   // TODO(sky): fix this, see comment in HasThumbnail.
   // ASSERT_TRUE(HasThumbnail(url_row.id()));
 
   // Unstar the URL and delete again.
-  bookmark_utils::RemoveAllBookmarks(bookmark_model_.get(), url);
+  history_client_.ClearAllBookmarks();
   ClearLastNotifications();
   expirer_.DeleteURL(url);
 
   // Now it should be completely deleted.
   EnsureURLInfoGone(url_row, false);
 }
 
 // Deletes multiple URLs at once.  The favicon for the third one but
 // not the first two should be deleted.
 TEST_F(ExpireHistoryTest, DeleteURLs) {
@@ skipping 416 matching lines @@
   main_db_->GetVisitsForURL(url_id, &archived_visits);
   EXPECT_EQ(0U, archived_visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistent FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history