summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/notifier/sync_notifier_factory.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 07:45:26 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 07:45:26 +0000
commit3fd7d7ca4dd5d484c541ff4983e3e83d0917baee (patch)
treee60c62e38a109e6b20aae5cc3e887cd44b31c034 /chrome/browser/sync/notifier/sync_notifier_factory.cc
parentf8c3aead7e7812724f1c21bb697464aca0edd89b (diff)
downloadchromium_src-3fd7d7ca4dd5d484c541ff4983e3e83d0917baee.zip
chromium_src-3fd7d7ca4dd5d484c541ff4983e3e83d0917baee.tar.gz
chromium_src-3fd7d7ca4dd5d484c541ff4983e3e83d0917baee.tar.bz2
[Sync] Move BridgedSyncNotifier and ChromeSyncNotificationBridge to glue/
sync_notifier isn't supposed to have dependencies on chrome. BUG=113723 TEST= Review URL: https://chromiumcodereview.appspot.com/9512005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/notifier/sync_notifier_factory.cc')
-rw-r--r--chrome/browser/sync/notifier/sync_notifier_factory.cc18
1 files changed, 6 insertions, 12 deletions
diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.cc b/chrome/browser/sync/notifier/sync_notifier_factory.cc
index 56fb236..9542f5f 100644
--- a/chrome/browser/sync/notifier/sync_notifier_factory.cc
+++ b/chrome/browser/sync/notifier/sync_notifier_factory.cc
@@ -10,7 +10,6 @@
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
-#include "chrome/browser/sync/notifier/bridged_sync_notifier.h"
#include "chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h"
#include "chrome/browser/sync/notifier/p2p_notifier.h"
#include "chrome/browser/sync/notifier/sync_notifier.h"
@@ -119,15 +118,13 @@ SyncNotifier* CreateDefaultSyncNotifier(
} // namespace
SyncNotifierFactory::SyncNotifierFactory(
- const Profile* profile,
const std::string& client_info,
const scoped_refptr<net::URLRequestContextGetter>&
request_context_getter,
const base::WeakPtr<InvalidationVersionTracker>&
invalidation_version_tracker,
const CommandLine& command_line)
- : chrome_notification_bridge_(profile),
- client_info_(client_info),
+ : client_info_(client_info),
request_context_getter_(request_context_getter),
initial_max_invalidation_versions_(
invalidation_version_tracker.get() ?
@@ -136,7 +133,6 @@ SyncNotifierFactory::SyncNotifierFactory(
invalidation_version_tracker_(invalidation_version_tracker),
command_line_(command_line) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(profile);
}
SyncNotifierFactory::~SyncNotifierFactory() {
@@ -144,12 +140,10 @@ SyncNotifierFactory::~SyncNotifierFactory() {
}
SyncNotifier* SyncNotifierFactory::CreateSyncNotifier() {
- return new BridgedSyncNotifier(
- &chrome_notification_bridge_,
- CreateDefaultSyncNotifier(command_line_,
- request_context_getter_,
- initial_max_invalidation_versions_,
- invalidation_version_tracker_,
- client_info_));
+ return CreateDefaultSyncNotifier(command_line_,
+ request_context_getter_,
+ initial_max_invalidation_versions_,
+ invalidation_version_tracker_,
+ client_info_);
}
} // namespace sync_notifier