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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 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
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 1d0e24314950da6ab144ad5bb93aac1530de9c06..20e964fe7e7bb7f3413ef71d8b0ea640f0f9267f 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -26,7 +26,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/model_test_utils.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_details.h"
@@ -52,7 +51,7 @@ void SwapDateAdded(BookmarkNode* n1, BookmarkNode* n2) {
n2->set_date_added(tmp);
}
-class BookmarkModelTest : public TestingBrowserProcessTest,
+class BookmarkModelTest : public testing::Test,
public BookmarkModelObserver {
public:
struct ObserverDetails {
@@ -694,13 +693,13 @@ void PopulateBookmarkNode(TestNode* parent,
}
// Test class that creates a BookmarkModel with a real history backend.
-class BookmarkModelTestWithProfile : public TestingBrowserProcessTest {
+class BookmarkModelTestWithProfile : public testing::Test {
public:
BookmarkModelTestWithProfile()
: ui_thread_(BrowserThread::UI, &message_loop_),
file_thread_(BrowserThread::FILE, &message_loop_) {}
- // TestingBrowserProcessTest:
+ // testing::Test:
virtual void TearDown() OVERRIDE {
profile_.reset(NULL);
}

Powered by Google App Engine
This is Rietveld 408576698