summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/sync_manager.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 12:11:37 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 12:11:37 +0000
commit5d5c13d1df9ffe304f595ea886092a75d4be381e (patch)
tree24df0b3f3ccd708fcb555a9320e46837f519cbe5 /sync/internal_api/sync_manager.cc
parenta1733df46d06f88f1d212de14a0ba352a5383731 (diff)
downloadchromium_src-5d5c13d1df9ffe304f595ea886092a75d4be381e.zip
chromium_src-5d5c13d1df9ffe304f595ea886092a75d4be381e.tar.gz
chromium_src-5d5c13d1df9ffe304f595ea886092a75d4be381e.tar.bz2
[Sync] Move HttpBridge to sync/
Remove all references to content in HttpBridge. Clean up handling of HTTP user agent in HttpBridge. BUG=133791 TEST= Review URL: https://chromiumcodereview.appspot.com/10645004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/sync_manager.cc')
-rw-r--r--sync/internal_api/sync_manager.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc
index 25eee06..eb5a02d 100644
--- a/sync/internal_api/sync_manager.cc
+++ b/sync/internal_api/sync_manager.cc
@@ -204,7 +204,6 @@ class SyncManager::SyncInternal
csync::ExtensionsActivityMonitor*
extensions_activity_monitor,
ChangeDelegate* change_delegate,
- const std::string& user_agent,
const SyncCredentials& credentials,
csync::SyncNotifier* sync_notifier,
const std::string& restored_key_for_bootstrapping,
@@ -720,7 +719,6 @@ bool SyncManager::Init(
const std::vector<csync::ModelSafeWorker*>& workers,
csync::ExtensionsActivityMonitor* extensions_activity_monitor,
ChangeDelegate* change_delegate,
- const std::string& user_agent,
const SyncCredentials& credentials,
csync::SyncNotifier* sync_notifier,
const std::string& restored_key_for_bootstrapping,
@@ -743,7 +741,6 @@ bool SyncManager::Init(
workers,
extensions_activity_monitor,
change_delegate,
- user_agent,
credentials,
sync_notifier,
restored_key_for_bootstrapping,
@@ -866,7 +863,6 @@ bool SyncManager::SyncInternal::Init(
const std::vector<csync::ModelSafeWorker*>& workers,
csync::ExtensionsActivityMonitor* extensions_activity_monitor,
ChangeDelegate* change_delegate,
- const std::string& user_agent,
const SyncCredentials& credentials,
csync::SyncNotifier* sync_notifier,
const std::string& restored_key_for_bootstrapping,
@@ -905,7 +901,7 @@ bool SyncManager::SyncInternal::Init(
report_unrecoverable_error_function_));
connection_manager_.reset(new SyncAPIServerConnectionManager(
- sync_server_and_path, port, use_ssl, user_agent, post_factory));
+ sync_server_and_path, port, use_ssl, post_factory));
net::NetworkChangeNotifier::AddIPAddressObserver(this);
observing_ip_address_changes_ = true;