Use OAuth2 token for sync

chrome/browser/sync/test_profile_sync_service.cc

Index: chrome/browser/sync/test_profile_sync_service.cc
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index 06d586a0400341f005d316d14909c04bd2e29d2d..d33d7f08690d2a7f878f158c7e9bfee8e5e1b46b 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -85,7 +85,7 @@ void SyncBackendHostForProfileSyncTest::InitCore(
       new TestInternalComponentsFactory(factory_switches, storage);
 
   SyncBackendHost::InitCore(test_options);
-  if (synchronous_init_) {
+  if (synchronous_init_ && !base::MessageLoop::current()->is_running()) {
     // The SyncBackend posts a task to the current loop when
     // initialization completes.
     base::MessageLoop::current()->Run();
@@ -247,6 +247,23 @@ TestProfileSyncService::components_factory_mock() {
   return static_cast<ProfileSyncComponentsFactoryMock*>(factory());
 }
 
+void TestProfileSyncService::RequestAccessToken() {
+  ProfileSyncService::RequestAccessToken();
+  if (synchronous_backend_initialization_) {
+    base::MessageLoop::current()->Run();
+  }
+}
+
+void TestProfileSyncService::OnGetTokenFailure(
+    const OAuth2TokenService::Request* request,
+    const GoogleServiceAuthError& error) {
+  ProfileSyncService::OnGetTokenFailure(request, error);
+  if (synchronous_backend_initialization_) {
+    base::MessageLoop::current()->Quit();

[Andrew T Wilson (Slow), 2013/06/04 14:37:32]

Should we also add an OnGetTokenSuccess() loop that quits the loop? I'm fuzzy on
why we need one here but not in that case.

Also, I'm OK with this, but I thought the preferred way to do this is to use a
RunLoop and to invoke RunLoop::Quit() instead of talking to the messageloop
directly (this is to more gracefully handle nested runloops without exiting the
nested loop prematurely).

[pavely, 2013/06/04 20:11:13]

In success case TryStart will be called and will result in backend
initialization and that other MessageLoop::Run call in
SyncBackendHostForProfileSyncTest::InitCore.

I actually spent quite some time trying to make it work with RunLoop, running in
different kinds of issues. I think the right approach is different.
TestProfileSyncService shouldn't invoke MessageLoop at all. Instead test should
create RunLoop on the stack, get QuitClosure from it and pass it into
TestProfileSyncService. Then TestProfileSyncService should just invoke that
Closure when it feels it is done and it's time for test to do something.
I want to implement this change but in separate CL.

+  }
+}
+
+
 void TestProfileSyncService::OnBackendInitialized(
     const syncer::WeakHandle<syncer::JsBackend>& backend,
     const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
@@ -299,3 +316,23 @@ void TestProfileSyncService::CreateBackend() {
       fail_initial_download_,
       storage_option_));
 }
+
+scoped_ptr<OAuth2TokenService::Request> FakeOAuth2TokenService::StartRequest(
+    const OAuth2TokenService::ScopeSet& scopes,
+    OAuth2TokenService::Consumer* consumer) {
+  // Ensure token in question is cached and never expires. Request will succeed
+  // without network IO.
+  RegisterCacheEntry(GetRefreshToken(), scopes, "access_token",
+      base::Time::Max());
+  return ProfileOAuth2TokenService::StartRequest(scopes, consumer);
+}
+
+BrowserContextKeyedService* FakeOAuth2TokenService::BuildTokenService(
+    content::BrowserContext* context) {
+  Profile* profile = static_cast<Profile*>(context);
+
+  FakeOAuth2TokenService* service =
+      new FakeOAuth2TokenService(context->GetRequestContext());
+  service->Initialize(profile);
+  return service;
+}