2 files changed, 14 insertions, 5 deletions
diff --git a/chrome/browser/sync/notifier/server_notifier_thread.cc b/chrome/browser/sync/notifier/server_notifier_thread.cc
index 8b2aba3..c31f502 100644
--- a/chrome/browser/sync/notifier/server_notifier_thread.cc
+++ b/chrome/browser/sync/notifier/server_notifier_thread.cc
@@ -9,14 +9,18 @@
 
 #include "base/logging.h"
 #include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
+#include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/notification_defines.h"
 
 namespace sync_notifier {
 
-ServerNotifierThread::ServerNotifierThread(bool use_chrome_async_socket,
-                                           bool try_ssltcp_first)
-    : notifier::MediatorThreadImpl(use_chrome_async_socket, try_ssltcp_first),
-      state_(notifier::STATE_DISCONNECTED) {}
+ServerNotifierThread::ServerNotifierThread(
+    const notifier::NotifierOptions& notifier_options)
+    : notifier::MediatorThreadImpl(notifier_options),
+      state_(notifier::STATE_DISCONNECTED) {
+  DCHECK_EQ(notifier::NOTIFICATION_SERVER,
+            notifier_options.notification_method);
+}
 
 ServerNotifierThread::~ServerNotifierThread() {}
 
diff --git a/chrome/browser/sync/notifier/server_notifier_thread.h b/chrome/browser/sync/notifier/server_notifier_thread.h
index 9247bd4..bcd85b0 100644
--- a/chrome/browser/sync/notifier/server_notifier_thread.h
+++ b/chrome/browser/sync/notifier/server_notifier_thread.h
@@ -21,13 +21,18 @@
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "jingle/notifier/listener/mediator_thread_impl.h"
 
+namespace notifier {
+struct NotifierOptions;
+}
+
 namespace sync_notifier {
 
 class ServerNotifierThread
     : public notifier::MediatorThreadImpl,
       public ChromeInvalidationClient::Listener {
  public:
-  ServerNotifierThread(bool use_chrome_async_socket, bool try_ssltcp_first);
+  explicit ServerNotifierThread(
+      const notifier::NotifierOptions& notifier_options);
 
   virtual ~ServerNotifierThread();