Use OAuth2 token for sync

sync/internal_api/syncapi_server_connection_manager.cc

 // Copyright (c) 2012 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 "sync/internal_api/syncapi_server_connection_manager.h"
 
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "sync/internal_api/public/http_post_provider_interface.h"
@@ skipping 13 matching lines @@
   post_provider_ = NULL;
 }
 
 bool SyncAPIBridgedConnection::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);
+  bool use_oauth2_token = false;
+  GetServerParams(&sync_server, &sync_server_port, &use_ssl, &use_oauth2_token);
   std::string connection_url = MakeConnectionURL(sync_server, path, use_ssl);
 
   HttpPostProviderInterface* http = post_provider_;
   http->SetURL(connection_url.c_str(), sync_server_port);
 
   if (!auth_token.empty()) {
-    const std::string& headers =
-        "Authorization: GoogleLogin auth=" + auth_token;
+    std::string headers;
+    if (use_oauth2_token)
+      headers = "Authorization: Bearer " + 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 error_code = 0;
   int response_code = 0;
@@ skipping 27 matching lines @@
 
 void SyncAPIBridgedConnection::Abort() {
   DCHECK(post_provider_);
   post_provider_->Abort();
 }
 
 SyncAPIServerConnectionManager::SyncAPIServerConnectionManager(
     const std::string& server,
     int port,
     bool use_ssl,
+    bool use_oauth2_token,
     HttpPostProviderFactory* factory)
-    : ServerConnectionManager(server, port, use_ssl),
+    : ServerConnectionManager(server, port, use_ssl, use_oauth2_token),
       post_provider_factory_(factory) {
   DCHECK(post_provider_factory_.get());
 }
 
 SyncAPIServerConnectionManager::~SyncAPIServerConnectionManager() {}
 
 ServerConnectionManager::Connection*
 SyncAPIServerConnectionManager::MakeConnection() {
   return new SyncAPIBridgedConnection(this, post_provider_factory_.get());
 }
 
 }  // namespace syncer