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

Unified Diff: chrome/test/live_sync/bookmark_model_verifier.cc

Issue 7318001: bookmarks: Rename |loaded_favicon_| to |is_favicon_loaded_| so it matches with the getter accessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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
Index: chrome/test/live_sync/bookmark_model_verifier.cc
diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index 3907aaebd8849bdaf409a28ba7bbd3813040b693..679f31b46943ba7eb53b1ecd27e02782775a3b90 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -35,7 +35,7 @@ class FaviconChangeObserver : public BookmarkModelObserver {
void WaitForGetFavicon() {
wait_for_load_ = true;
ui_test_utils::RunMessageLoop();
- ASSERT_TRUE(node_->is_favicon_loaded());
+ ASSERT_TRUE(node_->favicon_loaded());
}
void WaitForSetFavicon() {
wait_for_load_ = false;
@@ -66,7 +66,7 @@ class FaviconChangeObserver : public BookmarkModelObserver {
BookmarkModel* model,
const BookmarkNode* node) OVERRIDE {
if (model == model_ && node == node_) {
- if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded()))
+ if (!wait_for_load_ || (wait_for_load_ && node->favicon_loaded()))
MessageLoopForUI::current()->Quit();
}
}
@@ -319,12 +319,12 @@ const SkBitmap& BookmarkModelVerifier::GetFavicon(
}
// If a favicon was explicitly set, we may need to wait for it to be loaded
// via BookmarkModel::GetFavIcon(), which is an asynchronous operation.
- if (!node->is_favicon_loaded()) {
+ if (!node->favicon_loaded()) {
FaviconChangeObserver observer(model, node);
model->GetFavicon(node);
observer.WaitForGetFavicon();
}
- EXPECT_TRUE(node->is_favicon_loaded());
+ EXPECT_TRUE(node->favicon_loaded());
return node->favicon();
}
« chrome/browser/bookmarks/bookmark_model.h ('K') | « chrome/browser/bookmarks/bookmark_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698