Support Sync following Gaia OAuth authentication

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

Index: chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc
diff --git a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc
index 3ba02b44b1958bed7b9ce816f03b5091a6c96e80..0ab1244884624498b476cf33a63d60b4ec899fd4 100644
--- a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc
+++ b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc
@@ -4,9 +4,11 @@
 
 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h"
 
+#include "base/command_line.h"

[akalin, 2011/08/11 21:49:14]

remove this include (and include oauth.h)

[Rick Campbell, 2011/08/12 09:02:02]

Done.

 #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/common/chrome_switches.h"

[akalin, 2011/08/11 21:49:14]

remove this include (and include oauth.h)

[Rick Campbell, 2011/08/12 09:02:02]

Done.

 #include "chrome/common/net/http_return.h"
 
 using browser_sync::HttpResponse;
@@ -36,7 +38,13 @@ bool SyncAPIBridgedPost::Init(const char* path,
   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 (CommandLine::ForCurrentProcess()->HasSwitch(

[akalin, 2011/08/11 21:49:14]

use IsUsingOAuth here.  Or maybe decomp this into another function in oauth.h
(e.g., GetAuthHeaders() or something)

[Rick Campbell, 2011/08/12 09:02:02]

Done.  Also fixed one other stray use of kEnableSyncOAuth in
SyncSetupWizard::GetLoginState.

+            switches::kEnableSyncOAuth)) {
+      headers = "Authorization: OAuth " + auth_token;
+    } else {
+      headers = "Authorization: GoogleLogin auth=" + auth_token;
+    }
     http->SetExtraRequestHeaders(headers.c_str());
   }