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

Unified Diff: chrome/browser/bookmarks/bookmark_model_unittest.cc

Issue 15275004: bookmarks: Get rid of the dependency on history_notifications.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more android fixes Created 7 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
Index: chrome/browser/bookmarks/bookmark_model_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index e60eaa7d0c0025f6b04ecbb8c933200b0f4ca45f..5789977026f174de2774cb1fc9c2d28ff300da44 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -22,9 +22,6 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/bookmarks/bookmark_model_observer.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/history/history_notifications.h"
-#include "chrome/browser/history/history_service.h"
-#include "chrome/browser/history/history_service_factory.h"
#include "chrome/test/base/model_test_utils.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -950,30 +947,6 @@ TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) {
}
}
-// Simple test that removes a bookmark. This test exercises the code paths in
-// History that block till bookmark bar model is loaded.
-TEST_F(BookmarkModelTestWithProfile, RemoveNotification) {
- profile_.reset(new TestingProfile());
-
- profile_->CreateHistoryService(false, false);
- profile_->CreateBookmarkModel(true);
- BlockTillBookmarkModelLoaded();
-
- // Add a URL.
- GURL url("http://www.google.com");
- bookmark_utils::AddIfNotBookmarked(bb_model_, url, string16());
-
- HistoryServiceFactory::GetForProfile(
- profile_.get(), Profile::EXPLICIT_ACCESS)->AddPage(
- url, base::Time::Now(), NULL, 1, GURL(), history::RedirectList(),
- content::PAGE_TRANSITION_TYPED, history::SOURCE_BROWSED, false);
-
- // This won't actually delete the URL, rather it'll empty out the visits.
- // This triggers blocking on the BookmarkModel.
- HistoryServiceFactory::GetForProfile(
- profile_.get(), Profile::EXPLICIT_ACCESS)->DeleteURL(url);
-}
-
TEST_F(BookmarkModelTest, Sort) {
// Populate the bookmark bar node with nodes for 'B', 'a', 'd' and 'C'.
// 'C' and 'a' are folders.

Powered by Google App Engine
This is Rietveld 408576698