chrome/browser/sync/glue/typed_url_model_associator_unittest.cc - Issue 340643002: Use TestBrowserThreadBundle instead of TestBrowserThread in sync code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 340643002: Use TestBrowserThreadBundle instead of TestBrowserThread in sync code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 6 years, 6 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/browser/sync/glue/sync_backend_registrar_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_bookmark_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9c899ffa3535fec9217004f191274866f53ca00b..815a8d062a17f76733eaf01e3b629d5356180113 100644

--- a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc

+++ b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc

@@ -12,7 +12,8 @@

#include "chrome/browser/history/history_types.h"

#include "chrome/browser/sync/glue/typed_url_model_associator.h"

#include "chrome/browser/sync/profile_sync_service_mock.h"

-#include "content/public/test/test_browser_thread.h"

+#include "content/public/browser/browser_thread.h"

+#include "content/public/test/test_browser_thread_bundle.h"

#include "sync/protocol/typed_url_specifics.pb.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "url/gurl.h"

@@ -408,7 +409,8 @@ TEST_F(SyncTypedUrlModelAssociatorTest, NoTypedVisits) {

// association on the UI thread, then ensure that AssociateModels() returns

// false.

TEST_F(SyncTypedUrlModelAssociatorTest, TestAbort) {

- content::TestBrowserThread db_thread(BrowserThread::DB);

+ content::TestBrowserThreadBundle thread_bundle(

+ content::TestBrowserThreadBundle::REAL_DB_THREAD);

base::WaitableEvent startup(false, false);

base::WaitableEvent aborted(false, false);

base::WaitableEvent done(false, false);

@@ -417,7 +419,6 @@ TEST_F(SyncTypedUrlModelAssociatorTest, TestAbort) {

TypedUrlModelAssociator* associator(NULL);

// Fire off to the DB thread to create the model associator and start

// model association.

- db_thread.Start();

base::Closure callback = base::Bind(

&CreateModelAssociatorAsync, &startup, &aborted, &done, &associator,

&mock);