New authorization framework for sync. ...

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

 // Copyright (c) 2009 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/server_connection_manager.h"
 
 #include <errno.h>
 
 #include <ostream>
 #include <string>
@@ skipping 117 matching lines @@
   }
   // Notify if we've gone on or offline.
   if (server_reachable_ != conn_mgr_->server_reachable_)
     conn_mgr_->NotifyStatusChanged();
 }
 
 ServerConnectionManager::ServerConnectionManager(
     const string& server,
     int port,
     bool use_ssl,
-    const string& user_agent,
-    const string& client_id)
+    const string& user_agent)
     : sync_server_(server),
       sync_server_port_(port),
-      client_id_(client_id),
       user_agent_(user_agent),
       use_ssl_(use_ssl),
       proto_sync_path_(kSyncServerSyncPath),
       get_time_path_(kSyncServerGetTimePath),
       error_count_(0),
       channel_(new Channel(shutdown_event)),
       server_status_(HttpResponse::NONE),
       server_reachable_(false),
       reset_count_(0),
       terminate_all_io_(false) {
 }
 
 ServerConnectionManager::~ServerConnectionManager() {
   delete channel_;
 }
 
 void ServerConnectionManager::NotifyStatusChanged() {
   ServerConnectionEvent event = { ServerConnectionEvent::STATUS_CHANGED,
                                   server_status_,
                                   server_reachable_ };
   channel_->NotifyListeners(event);
 }
 
-// Uses currently set auth token. Set by AuthWatcher.
 bool ServerConnectionManager::PostBufferWithCachedAuth(
     const PostBufferParams* params, ScopedServerStatusWatcher* watcher) {
   string path =
       MakeSyncServerPath(proto_sync_path(), MakeSyncQueryString(client_id_));
   return PostBufferToPath(params, path, auth_token(), watcher);
 }
 
-bool ServerConnectionManager::PostBufferWithAuth(const PostBufferParams* params,
-    const string& auth_token, ScopedServerStatusWatcher* watcher) {
-  string path = MakeSyncServerPath(proto_sync_path(),
-                                   MakeSyncQueryString(client_id_));
-
-  return PostBufferToPath(params, path, auth_token, watcher);
-}
-
 bool ServerConnectionManager::PostBufferToPath(const PostBufferParams* params,
     const string& path, const string& auth_token,
     ScopedServerStatusWatcher* watcher) {
   DCHECK(watcher != NULL);
   scoped_ptr<Post> post(MakePost());
   post->set_timing_info(params->timing_info);
   bool ok = post->Init(path.c_str(), auth_token, params->buffer_in,
                        params->response);
 
   if (!ok || RC_REQUEST_OK != params->response->response_code) {
@@ skipping 166 matching lines @@
 
 }  // namespace browser_sync
 
 std::ostream& operator << (std::ostream& s,
                            const struct browser_sync::HttpResponse& hr) {
   s << " Response Code (bogus on error): " << hr.response_code;
   s << " Content-Length (bogus on error): " << hr.content_length;
   s << " Server Status: " << hr.server_status;
   return s;
 }