Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5280)

Unified Diff: chrome/browser/sync/notifier/sync_notifier_factory.cc

Issue 9512005: [Sync] Move BridgedSyncNotifier and ChromeSyncNotificationBridge to glue/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/notifier/sync_notifier_factory.cc
diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.cc b/chrome/browser/sync/notifier/sync_notifier_factory.cc
index 56fb23671893341d38b477d0b00158952707c4dd..9542f5fc327d45ed6397bab6ee64cd18dbaabac0 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

Powered by Google App Engine
This is Rietveld 408576698