chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc - Issue 8392042: Split BrowserThread into public API and private implementation, step 1.

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/non_frontend_data_type_controller_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

« no previous file with comments | « chrome/browser/sync/glue/non_frontend_data_type_controller.cc ('k') | chrome/browser/sync/glue/password_data_type_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e1c0c20451e8ab968708b24da5e150b2243f5c09..b283c3d1831b34b9a4ac0ac98174b26f8c974598 100644

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

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

@@ -7,20 +7,20 @@

#include "base/callback.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

+#include "base/synchronization/waitable_event.h"

#include "base/task.h"

#include "base/test/test_timeouts.h"

#include "base/tracked_objects.h"

-#include "base/synchronization/waitable_event.h"

#include "chrome/browser/sync/engine/model_safe_worker.h"

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

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

+#include "chrome/browser/sync/glue/model_associator_mock.h"

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

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

-#include "chrome/browser/sync/glue/model_associator_mock.h"

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

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

#include "chrome/test/base/profile_mock.h"

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

+#include "content/test/test_browser_thread.h"

using base::WaitableEvent;

using browser_sync::ChangeProcessorMock;

@@ -189,8 +189,8 @@ class NonFrontendDataTypeControllerTest : public testing::Test {

}

MessageLoopForUI message_loop_;

- BrowserThread ui_thread_;

- BrowserThread db_thread_;

+ content::TestBrowserThread ui_thread_;

+ content::TestBrowserThread db_thread_;

scoped_refptr<NonFrontendDataTypeControllerFake> non_frontend_dtc_;

scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_;

scoped_refptr<NonFrontendDataTypeControllerMock> dtc_mock_;