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

Unified Diff: chrome/test/testing_profile.cc

Issue 7055021: Renames BookmarkModelObserver::BookmarkNodeFaviconLoaded to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 9 years, 7 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
« no previous file with comments | « chrome/test/live_sync/bookmark_model_verifier.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_profile.cc
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 1dd64b4e7ceccfd4b69566ab042d606c340be8b1..e78ee9b9a539831d0c16a5b4c66f0499bf067261 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -43,6 +43,7 @@
#include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/url_constants.h"
+#include "chrome/test/bookmark_load_observer.h"
#include "chrome/test/test_url_request_context_getter.h"
#include "chrome/test/testing_pref_service.h"
#include "chrome/test/ui_test_utils.h"
@@ -86,39 +87,6 @@ class QuittingHistoryDBTask : public HistoryDBTask {
DISALLOW_COPY_AND_ASSIGN(QuittingHistoryDBTask);
};
-// BookmarkLoadObserver is used when blocking until the BookmarkModel
-// finishes loading. As soon as the BookmarkModel finishes loading the message
-// loop is quit.
-class BookmarkLoadObserver : public BookmarkModelObserver {
- public:
- BookmarkLoadObserver() {}
- virtual void Loaded(BookmarkModel* model) {
- MessageLoop::current()->Quit();
- }
-
- virtual void BookmarkNodeMoved(BookmarkModel* model,
- const BookmarkNode* old_parent,
- int old_index,
- const BookmarkNode* new_parent,
- int new_index) {}
- virtual void BookmarkNodeAdded(BookmarkModel* model,
- const BookmarkNode* parent,
- int index) {}
- virtual void BookmarkNodeRemoved(BookmarkModel* model,
- const BookmarkNode* parent,
- int old_index,
- const BookmarkNode* node) {}
- virtual void BookmarkNodeChanged(BookmarkModel* model,
- const BookmarkNode* node) {}
- virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
- const BookmarkNode* node) {}
- virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
- const BookmarkNode* node) {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver);
-};
-
class TestExtensionURLRequestContext : public net::URLRequestContext {
public:
TestExtensionURLRequestContext() {
« no previous file with comments | « chrome/test/live_sync/bookmark_model_verifier.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698