Support Sync following Gaia OAuth authentication

chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h"
 
+#include "base/command_line.h"
 #include "chrome/browser/sync/engine/http_post_provider_factory.h"
 #include "chrome/browser/sync/engine/http_post_provider_interface.h"
 #include "chrome/browser/sync/engine/syncapi.h"
+#include "chrome/browser/sync/sync_setup_wizard.h"

[tim (not reviewing), 2011/08/10 19:39:36]

Although we don't have a DEPS rule enforcing this, we shouldn't have a
dependency on browser/sync or UI code from engine.  

[Rick Campbell, 2011/08/11 03:58:23]

Done.  Eliminated SyncSetupWizard::IsUsingOAuth()

+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/http_return.h"
 
 using browser_sync::HttpResponse;
 
 namespace sync_api {
 
 SyncAPIBridgedPost::SyncAPIBridgedPost(
     browser_sync::ServerConnectionManager* scm,
     HttpPostProviderFactory* factory)
     : Post(scm), factory_(factory) {
 }
 
 SyncAPIBridgedPost::~SyncAPIBridgedPost() {}
 
 bool SyncAPIBridgedPost::Init(const char* path,
                               const std::string& auth_token,
                               const std::string& payload,
                               HttpResponse* response) {
   std::string sync_server;
   int sync_server_port = 0;
   bool use_ssl = false;
   GetServerParams(&sync_server, &sync_server_port, &use_ssl);
   std::string connection_url = MakeConnectionURL(sync_server, path, use_ssl);
 
   HttpPostProviderInterface* http = factory_->Create();
   http->SetUserAgent(scm_->user_agent().c_str());
   http->SetURL(connection_url.c_str(), sync_server_port);
 
   if (!auth_token.empty()) {
-    std::string headers = "Authorization: GoogleLogin auth=" + auth_token;
+    std::string headers;
+    if (SyncSetupWizard::IsUsingOAuth()) {
+      headers = "Authorization: OAuth " + auth_token;
+    } else {
+      headers = "Authorization: GoogleLogin auth=" + auth_token;
+    }
     http->SetExtraRequestHeaders(headers.c_str());
   }
 
   // Must be octet-stream, or the payload may be parsed for a cookie.
   http->SetPostPayload("application/octet-stream", payload.length(),
                        payload.data());
 
   // Issue the POST, blocking until it finishes.
   int os_error_code = 0;
   int response_code = 0;
@@ skipping 40 matching lines @@
 }
 
 SyncAPIServerConnectionManager::~SyncAPIServerConnectionManager() {}
 
 browser_sync::ServerConnectionManager::Post*
 SyncAPIServerConnectionManager::MakePost() {
   return new SyncAPIBridgedPost(this, post_provider_factory_.get());
 }
 
 }  // namespace sync_api