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

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator_unittest.cc

Issue 8392042: Split BrowserThread into public API and private implementation, step 1. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 2 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/sync/glue/typed_url_model_associator_unittest.cc
diff --git a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
index d0af13332457a3e263345dd0596fb6a6b609f87e..f5d548bce7ed35cfde88f152a030d0bbcf32d4f3 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/sync/glue/typed_url_model_associator.h"
#include "chrome/browser/sync/profile_sync_service_mock.h"
#include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"
-#include "content/browser/browser_thread.h"
+#include "content/test/test_browser_thread.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -419,7 +419,7 @@ static void CreateModelAssociator(base::WaitableEvent* startup,
// association on the UI thread, then ensure that AssociateModels() returns
// false.
TEST_F(TypedUrlModelAssociatorTest, TestAbort) {
- BrowserThread db_thread(BrowserThread::DB);
+ content::TestBrowserThread db_thread(BrowserThread::DB);
base::WaitableEvent startup(false, false);
base::WaitableEvent aborted(false, false);
base::WaitableEvent done(false, false);
« no previous file with comments | « chrome/browser/sync/glue/typed_url_data_type_controller.cc ('k') | chrome/browser/sync/glue/ui_model_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698