Componentize expire_history_backend.{cc,h}

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"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/history/expire_history_backend.h"
-#include "chrome/browser/history/history_details.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
+#include "components/history/core/browser/expire_history_backend.h"
 #include "components/history/core/browser/history_backend_notifier.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/thumbnail_database.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "components/history/core/test/history_client_fake_bookmarks.h"
 #include "components/history/core/test/test_history_database.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"
@@ skipping 23 matching lines @@
         db_thread_(BrowserThread::DB, &message_loop_),
         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.
+  // Returns true if the given favicon/thumbnail 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 automatically
   // |expired|, or manually deleted.
   void EnsureURLInfoGone(const URLRow& row, bool expired);
 
   // Returns whether HistoryBackendNotifier::NotifyURLsModified was
   // called for |url|.
   bool ModifiedNotificationSent(const GURL& url);
 
   // Clears the list of notifications received.
   void ClearLastNotifications() {
-    STLDeleteValues(&notifications_);
     urls_modified_notifications_.clear();
     urls_deleted_notifications_.clear();
   }
 
   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(); }
@@ skipping 10 matching lines @@
   ExpireHistoryBackend expirer_;
 
   scoped_ptr<HistoryDatabase> main_db_;
   scoped_ptr<ThumbnailDatabase> thumb_db_;
   TestingProfile profile_;
   scoped_refptr<TopSites> top_sites_;
 
   // Time at the beginning of the test, so everybody agrees what "now" is.
   const Time now_;
 
-  // Notifications intended to be broadcast, we can check these values to make
-  // sure that the deletor is doing the correct broadcasts. We own the details
-  // pointers.
-  typedef std::vector< std::pair<int, HistoryDetails*> >
-      NotificationList;
-  NotificationList notifications_;
-
+  // Details received from HistoryObserver events.
   typedef std::vector<URLRows> URLsModifiedNotificationList;
   URLsModifiedNotificationList urls_modified_notifications_;
 
   typedef std::vector<std::pair<bool, URLRows>> URLsDeletedNotificationList;
   URLsDeletedNotificationList urls_deleted_notifications_;
 
  private:
   void SetUp() override {
     ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
 
@@ skipping 743 matching lines @@
   EXPECT_TRUE(all->Read(now, main_db_.get(), &visits, 1));
   EXPECT_EQ(1U, 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