| 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();
|
| }
|
|
|
|
|