Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1330)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/history/android/android_provider_backend_unittest.cc

Issue 484213002: Refactor HistoryService to not send NOTIFICATION_FAVICON_CHANGED (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix android compilation Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/history/android/android_provider_backend.cc ('K') | « chrome/browser/history/android/android_provider_backend.cc ('k') | chrome/browser/history/history_backend.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/android/android_provider_backend_unittest.cc
diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index 49137a2ce444d6e2464a8f4e4d77f6ad5a01a8a1..3541349ead8720dd5d8c5fda30fc8a6ea756bc39 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -14,7 +14,6 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/favicon/favicon_changed_details.h"
#include "chrome/browser/history/android/android_time.h"
#include "chrome/browser/history/chrome_history_client.h"
#include "chrome/browser/history/chrome_history_client_factory.h"
@@ -64,6 +63,9 @@ class AndroidProviderBackendDelegate : public HistoryBackend::Delegate {
virtual void NotifyProfileError(sql::InitStatus init_status) OVERRIDE {}
virtual void SetInMemoryBackend(
scoped_ptr<InMemoryHistoryBackend> backend) OVERRIDE {}
+ virtual void NotifyFaviconChanged(const std::set<GURL>& url) OVERRIDE {
+ favicon_changed_.reset(new std::set<GURL>(url.begin(), url.end()));
+ }
virtual void BroadcastNotifications(
int type,
scoped_ptr<HistoryDetails> details) OVERRIDE {
@@ -72,14 +74,12 @@ class AndroidProviderBackendDelegate : public HistoryBackend::Delegate {
deleted_details_.reset(
static_cast<URLsDeletedDetails*>(details.release()));
break;
- case chrome::NOTIFICATION_FAVICON_CHANGED:
- favicon_details_.reset(
- static_cast<FaviconChangedDetails*>(details.release()));
- break;
case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED:
modified_details_.reset(
static_cast<URLsModifiedDetails*>(details.release()));
break;
+ default:
+ NOTREACHED() << "Unexpected notification type: " << type;
}
}
virtual void DBLoaded() OVERRIDE {}
@@ -94,20 +94,18 @@ class AndroidProviderBackendDelegate : public HistoryBackend::Delegate {
return modified_details_.get();
}
- FaviconChangedDetails* favicon_details() const {
- return favicon_details_.get();
- }
+ std::set<GURL>* favicon_changed() const { return favicon_changed_.get(); }
void ResetDetails() {
deleted_details_.reset();
modified_details_.reset();
- favicon_details_.reset();
+ favicon_changed_.reset();
}
private:
scoped_ptr<URLsDeletedDetails> deleted_details_;
scoped_ptr<URLsModifiedDetails> modified_details_;
- scoped_ptr<FaviconChangedDetails> favicon_details_;
+ scoped_ptr<std::set<GURL>> favicon_changed_;
brettw 2014/09/02 23:23:10 Ditto on >>
sdefresne 2014/09/03 10:00:01 Done.
DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendDelegate);
};
@@ -534,7 +532,7 @@ TEST_F(AndroidProviderBackendTest, InsertHistoryAndBookmark) {
delegate_.modified_details()->changed_urls[0].visit_count());
EXPECT_EQ(row1.title(),
delegate_.modified_details()->changed_urls[0].title());
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
content::RunAllPendingInMessageLoop();
ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
@@ -552,10 +550,10 @@ TEST_F(AndroidProviderBackendTest, InsertHistoryAndBookmark) {
delegate_.modified_details()->changed_urls[0].last_visit());
EXPECT_EQ(row2.title(),
delegate_.modified_details()->changed_urls[0].title());
- ASSERT_TRUE(delegate_.favicon_details());
- ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
- ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
- delegate_.favicon_details()->urls.find(row2.url()));
+ ASSERT_TRUE(delegate_.favicon_changed());
+ ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+ ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+ delegate_.favicon_changed()->find(row2.url()));
std::vector<HistoryAndBookmarkRow::ColumnID> projections;
projections.push_back(HistoryAndBookmarkRow::ID);
@@ -665,7 +663,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) {
delegate_.deleted_details()->rows[0].last_visit());
EXPECT_EQ(row1.title(),
delegate_.deleted_details()->rows[0].title());
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
std::vector<HistoryAndBookmarkRow::ColumnID> projections;
projections.push_back(HistoryAndBookmarkRow::ID);
@@ -712,10 +710,10 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) {
delegate_.deleted_details()->rows[0].last_visit());
EXPECT_EQ(row2.title(),
delegate_.deleted_details()->rows[0].title());
- ASSERT_TRUE(delegate_.favicon_details());
- ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
- ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
- delegate_.favicon_details()->urls.find(row2.url()));
+ ASSERT_TRUE(delegate_.favicon_changed());
+ ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+ ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+ delegate_.favicon_changed()->find(row2.url()));
ASSERT_EQ(1, deleted_count);
scoped_ptr<AndroidStatement> statement1(backend->QueryHistoryAndBookmarks(
@@ -887,7 +885,7 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) {
delegate_.modified_details()->changed_urls[0].last_visit()));
EXPECT_EQ(row1.title(),
delegate_.modified_details()->changed_urls[0].title());
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
EXPECT_EQ(1, update_count);
// We shouldn't find orignal url anymore.
@@ -947,12 +945,12 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) {
delegate_.modified_details()->changed_urls[0].last_visit()));
EXPECT_EQ(update_row2.visit_count(),
delegate_.modified_details()->changed_urls[0].visit_count());
- ASSERT_TRUE(delegate_.favicon_details());
- ASSERT_EQ(2u, delegate_.favicon_details()->urls.size());
- ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
- delegate_.favicon_details()->urls.find(row2.url()));
- ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
- delegate_.favicon_details()->urls.find(update_row2.url()));
+ ASSERT_TRUE(delegate_.favicon_changed());
+ ASSERT_EQ(2u, delegate_.favicon_changed()->size());
+ ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+ delegate_.favicon_changed()->find(row2.url()));
+ ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+ delegate_.favicon_changed()->find(update_row2.url()));
EXPECT_EQ(1, update_count);
// We shouldn't find orignal url anymore.
@@ -1034,7 +1032,7 @@ TEST_F(AndroidProviderBackendTest, UpdateVisitCount) {
delegate_.modified_details()->changed_urls[0].last_visit()));
EXPECT_EQ(update_row1.visit_count(),
delegate_.modified_details()->changed_urls[0].visit_count());
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
// All visits should be removed, and 5 new visit insertted.
URLRow new_row1;
@@ -1115,7 +1113,7 @@ TEST_F(AndroidProviderBackendTest, UpdateLastVisitTime) {
EXPECT_EQ(ToDatabaseTime(update_row1.last_visit_time()),
ToDatabaseTime(
delegate_.modified_details()->changed_urls[0].last_visit()));
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
URLRow new_row1;
ASSERT_TRUE(history_db_.GetRowForURL(row1.url(), &new_row1));
@@ -1175,10 +1173,10 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
// Verify notifications.
EXPECT_FALSE(delegate_.deleted_details());
EXPECT_FALSE(delegate_.modified_details());
- ASSERT_TRUE(delegate_.favicon_details());
- ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
- ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
- delegate_.favicon_details()->urls.find(row1.url()));
+ ASSERT_TRUE(delegate_.favicon_changed());
+ ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+ ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+ delegate_.favicon_changed()->find(row1.url()));
std::vector<IconMapping> icon_mappings;
EXPECT_TRUE(thumbnail_db_.GetIconMappingsForPageURL(
@@ -1205,10 +1203,10 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
// Verify notifications.
EXPECT_FALSE(delegate_.deleted_details());
EXPECT_FALSE(delegate_.modified_details());
- ASSERT_TRUE(delegate_.favicon_details());
- ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
- ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
- delegate_.favicon_details()->urls.find(row1.url()));
+ ASSERT_TRUE(delegate_.favicon_changed());
+ ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+ ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+ delegate_.favicon_changed()->find(row1.url()));
EXPECT_FALSE(thumbnail_db_.GetIconMappingsForPageURL(
row1.url(), favicon_base::FAVICON, NULL));
@@ -1658,7 +1656,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistory) {
delegate_.modified_details()->changed_urls[0].url());
EXPECT_EQ(Time::UnixEpoch(),
delegate_.modified_details()->changed_urls[0].last_visit());
- EXPECT_EQ(1u, delegate_.favicon_details()->urls.size());
+ EXPECT_EQ(1u, delegate_.favicon_changed()->size());
}
TEST_F(AndroidProviderBackendTest, TestMultipleNestingTransaction) {
@@ -1965,7 +1963,7 @@ TEST_F(AndroidProviderBackendTest, InsertWithoutThumbnailDB) {
delegate_.modified_details()->changed_urls[0].visit_count());
EXPECT_EQ(row1.title(),
delegate_.modified_details()->changed_urls[0].title());
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
content::RunAllPendingInMessageLoop();
ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
@@ -1985,7 +1983,7 @@ TEST_F(AndroidProviderBackendTest, InsertWithoutThumbnailDB) {
delegate_.modified_details()->changed_urls[0].title());
// Favicon details is still false because thumbnail database wasn't
// initialized, we ignore any changes of favicon.
- ASSERT_FALSE(delegate_.favicon_details());
+ ASSERT_FALSE(delegate_.favicon_changed());
}
TEST_F(AndroidProviderBackendTest, DeleteWithoutThumbnailDB) {
@@ -2056,7 +2054,7 @@ TEST_F(AndroidProviderBackendTest, DeleteWithoutThumbnailDB) {
EXPECT_FALSE(delegate_.modified_details());
EXPECT_EQ(2u, delegate_.deleted_details()->rows.size());
// No favicon has been deleted.
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
// No row exists.
std::vector<HistoryAndBookmarkRow::ColumnID> projections;
@@ -2129,7 +2127,7 @@ TEST_F(AndroidProviderBackendTest, UpdateFaviconWithoutThumbnail) {
ASSERT_TRUE(delegate_.modified_details());
ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
// No favicon will be updated as thumbnail database is missing.
- EXPECT_FALSE(delegate_.favicon_details());
+ EXPECT_FALSE(delegate_.favicon_changed());
}
} // namespace history
« chrome/browser/history/android/android_provider_backend.cc ('K') | « chrome/browser/history/android/android_provider_backend.cc ('k') | chrome/browser/history/history_backend.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698