chrome/browser/sync/profile_sync_service_harness.cc - Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class.

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/profile_sync_service_harness.cc

Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: deal with new enterprise_platform_keys_private_api Created 7 years, 8 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/profile_sync_service_factory.cc ('k') | chrome/browser/sync/profile_sync_service_password_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_harness.cc

diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc

index eb0b074d9cdf8b373bbd3b1bc90c56a7717765b7..c7367cc2af99cc155fd83aac11785eff6c40d52a 100644

--- a/chrome/browser/sync/profile_sync_service_harness.cc

+++ b/chrome/browser/sync/profile_sync_service_harness.cc

@@ -20,12 +20,19 @@

#include "base/logging.h"

#include "base/memory/ref_counted.h"

#include "base/message_loop.h"

+#include "base/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

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

+#include "chrome/browser/signin/signin_manager_base.h"

+#include "chrome/browser/signin/token_service.h"

+#include "chrome/browser/signin/token_service_factory.h"

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

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

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

+#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

+#include "chrome/common/pref_names.h"

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

+#include "google_apis/gaia/gaia_constants.h"

#include "sync/internal_api/public/base/progress_marker_map.h"

#include "sync/internal_api/public/sessions/sync_session_snapshot.h"

#include "sync/internal_api/public/util/sync_string_conversions.h"

@@ -179,8 +186,16 @@ bool ProfileSyncServiceHarness::SetupSync(

service_->SetSetupInProgress(true);

// Authenticate sync client using GAIA credentials.

- service_->signin()

- ->StartSignIn(username_, password_, std::string(), std::string());

+ service_->signin()->SetAuthenticatedUsername(username_);

+ profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,

+ username_);

+ GoogleServiceSigninSuccessDetails details(username_, password_);

+ content::NotificationService::current()->Notify(

+ chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,

+ content::Source<Profile>(profile_),

+ content::Details<const GoogleServiceSigninSuccessDetails>(&details));

+ TokenServiceFactory::GetForProfile(profile_)->IssueAuthTokenForTest(

+ GaiaConstants::kSyncService, "sync_token");

// Wait for the OnBackendInitialized() callback.

if (!AwaitBackendInitialized()) {