[Sync] Make P2PNotifier behave more like InvalidationNotifier

chrome/browser/sync/notifier/sync_notifier_factory.cc

 // Copyright (c) 2011 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/notifier/sync_notifier_factory.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.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"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/notifier_options.h"
+#include "jingle/notifier/listener/mediator_thread_impl.h"
+#include "jingle/notifier/listener/talk_mediator_impl.h"
 #include "net/base/host_port_pair.h"
 
 namespace sync_notifier {
 namespace {
 
 // TODO(akalin): Figure out whether this should be a method of
 // HostPortPair.
 net::HostPortPair StringToHostPortPair(const std::string& host_port_str,
                                        uint16 default_port) {
   std::string::size_type colon_index = host_port_str.find(':');
@@ skipping 53 matching lines @@
   }
 
   if (command_line.HasSwitch(switches::kSyncNotificationMethod)) {
     const std::string notification_method_str(
         command_line.GetSwitchValueASCII(switches::kSyncNotificationMethod));
     notifier_options.notification_method =
         notifier::StringToNotificationMethod(notification_method_str);
   }
 
   if (notifier_options.notification_method == notifier::NOTIFICATION_P2P) {
-    return new P2PNotifier(notifier_options);
+    notifier::TalkMediator* const talk_mediator =
+        new notifier::TalkMediatorImpl(
+            new notifier::MediatorThreadImpl(notifier_options),
+            notifier_options);
+    // Takes ownership of |talk_mediator|.
+    return new P2PNotifier(talk_mediator);
   }
 
   return new NonBlockingInvalidationNotifier(notifier_options, client_info);
 }
 }  // namespace
 
 SyncNotifierFactory::SyncNotifierFactory(
     const std::string& client_info,
     const scoped_refptr<net::URLRequestContextGetter>&
         request_context_getter,
     const CommandLine& command_line)
     : client_info_(client_info),
       request_context_getter_(request_context_getter),
       command_line_(command_line) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 SyncNotifierFactory::~SyncNotifierFactory() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 SyncNotifier* SyncNotifierFactory::CreateSyncNotifier() {
   return CreateDefaultSyncNotifier(command_line_,
                                    request_context_getter_,
                                    client_info_);
 }
 }  // namespace sync_notifier