trunk/src/chrome/browser/sync/profile_sync_service_session_unittest.cc - Issue 98323003: Revert 238348 "Clean up TestProfileSyncService and related tests"

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: trunk/src/chrome/browser/sync/profile_sync_service_session_unittest.cc

Issue 98323003: Revert 238348 "Clean up TestProfileSyncService and related tests" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years 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 | « trunk/src/chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | trunk/src/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/sync/profile_sync_service_session_unittest.cc

===================================================================

--- trunk/src/chrome/browser/sync/profile_sync_service_session_unittest.cc (revision 238367)

+++ trunk/src/chrome/browser/sync/profile_sync_service_session_unittest.cc (working copy)

@@ -19,8 +19,6 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/invalidation/invalidation_service_factory.h"

#include "chrome/browser/sessions/session_tab_helper.h"

-#include "chrome/browser/signin/profile_oauth2_token_service.h"

-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

#include "chrome/browser/signin/signin_manager.h"

#include "chrome/browser/signin/signin_manager_factory.h"

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

@@ -86,12 +84,14 @@

Profile* profile,

SigninManagerBase* signin,

ProfileOAuth2TokenService* oauth2_token_service,

- ProfileSyncService::StartBehavior behavior)

+ ProfileSyncService::StartBehavior behavior,

+ bool synchronous_backend_initialization)

: TestProfileSyncService(factory,

profile,

signin,

oauth2_token_service,

- behavior) {}

+ behavior,

+ synchronous_backend_initialization) {}

virtual ~FakeProfileSyncService() {}

virtual scoped_ptr<DeviceInfo> GetLocalDeviceInfo() const OVERRIDE {

@@ -198,7 +198,8 @@

profile(),

signin,

oauth2_token_service,

- ProfileSyncService::AUTO_START));

+ ProfileSyncService::AUTO_START,

+ false));

sync_service_->set_backend_init_callback(callback);

// Register the session data type.