chrome/browser/sync/glue/bookmark_data_type_controller_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/bookmark_data_type_controller_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/about_sync_util_unittest.cc ('k') | chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc

index d5a6a1ae359c049cf3b23696614f5a24ca8be3df..01c03537ef1857cf221ca9fcbfa43d341684889e 100644

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

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

@@ -8,7 +8,6 @@

#include "base/bind_helpers.h"

#include "base/callback.h"

#include "base/memory/scoped_ptr.h"

-#include "base/message_loop/message_loop.h"

#include "base/prefs/pref_service.h"

#include "base/run_loop.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

@@ -30,7 +29,7 @@

#include "components/sync_driver/model_associator_mock.h"

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

#include "content/public/browser/notification_service.h"

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

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

#include "sync/api/sync_error.h"

#include "testing/gmock/include/gmock/gmock.h"

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

@@ -41,7 +40,6 @@ using browser_sync::DataTypeController;

using browser_sync::ModelAssociatorMock;

using browser_sync::ModelLoadCallbackMock;

using browser_sync::StartCallbackMock;

-using content::BrowserThread;

using testing::_;

using testing::DoAll;

using testing::InvokeWithoutArgs;

@@ -96,7 +94,7 @@ KeyedService* BuildHistoryService(content::BrowserContext* profile) {

class SyncBookmarkDataTypeControllerTest : public testing::Test {

public:

SyncBookmarkDataTypeControllerTest()

- : ui_thread_(BrowserThread::UI, &message_loop_),

+ : thread_bundle_(content::TestBrowserThreadBundle::DEFAULT),

service_(&profile_) {}

virtual void SetUp() {

@@ -165,8 +163,7 @@ class SyncBookmarkDataTypeControllerTest : public testing::Test {

base::Unretained(&start_callback_)));

}

- base::MessageLoopForUI message_loop_;

- content::TestBrowserThread ui_thread_;

+ content::TestBrowserThreadBundle thread_bundle_;

scoped_refptr<BookmarkDataTypeController> bookmark_dtc_;

scoped_ptr<ProfileSyncComponentsFactoryMock> profile_sync_factory_;

ProfileMock profile_;