[Sync] Replace TalkMediator*/MediatorThread* with PushClient

jingle/notifier/base/notifier_options_util.h

Index: jingle/notifier/base/notifier_options_util.h
diff --git a/jingle/notifier/base/notifier_options_util.h b/jingle/notifier/base/notifier_options_util.h
index 42783290d22344c750eb930db8313f8e9622bf9f..6ba24716a6cd37fdc97a6fbd73149c372d69e390 100644
--- a/jingle/notifier/base/notifier_options_util.h
+++ b/jingle/notifier/base/notifier_options_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 //
@@ -19,8 +19,7 @@ struct NotifierOptions;
 
 buzz::XmppClientSettings MakeXmppClientSettings(
     const NotifierOptions& notifier_options,
-    const std::string& email, const std::string& token,
-    const std::string& token_service);
+    const std::string& email, const std::string& token);
 
 ServerList GetServerList(const NotifierOptions& notifier_options);