Implemented initial version of server-issued notification client.

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2006-2009 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/engine/syncapi.h"
 
 #include "build/build_config.h"
 
 #include <iomanip>
 #include <list>
@@ skipping 14 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/sync/sync_constants.h"
 #include "chrome/browser/sync/engine/all_status.h"
 #include "chrome/browser/sync/engine/auth_watcher.h"
 #include "chrome/browser/sync/engine/change_reorder_buffer.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_thread.h"
+#include "chrome/browser/sync/notifier/server_notifier_thread.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
 #include "chrome/browser/sync/protocol/service_constants.h"
 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"
 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
@@ skipping 1233 matching lines @@
   allstatus_.WatchConnectionManager(connection_manager());
 
   network_change_notifier_.reset(
       new chrome_common_net::NetworkChangeNotifierProxy(
           network_change_notifier_thread));
   network_change_notifier_->AddObserver(this);
   // TODO(akalin): CheckServerReachable() can block, which may cause
   // jank if we try to shut down sync.  Fix this.
   connection_manager()->CheckServerReachable();
 
+  // NOTIFICATION_SERVER uses a substantially different notification
+  // method, so it has its own MediatorThread implementation.
+  // Everything else just uses MediatorThreadImpl.
+  notifier::MediatorThread* mediator_thread =
+      (notification_method == browser_sync::NOTIFICATION_SERVER) ?
+      static_cast<notifier::MediatorThread*>(
+          new sync_notifier::ServerNotifierThread(
+              network_change_notifier_thread)) :
+      static_cast<notifier::MediatorThread*>(
+          new notifier::MediatorThreadImpl(network_change_notifier_thread));
   const bool kInitializeSsl = true;
   const bool kConnectImmediately = false;
   talk_mediator_.reset(new TalkMediatorImpl(
-      new notifier::MediatorThreadImpl(network_change_notifier_thread),
+      mediator_thread,
       kInitializeSsl, kConnectImmediately, invalidate_xmpp_auth_token));
-  if (notification_method != browser_sync::NOTIFICATION_LEGACY) {
+  if (notification_method != browser_sync::NOTIFICATION_LEGACY &&
+      notification_method != browser_sync::NOTIFICATION_SERVER) {
     if (notification_method == browser_sync::NOTIFICATION_TRANSITIONAL) {
       talk_mediator_->AddSubscribedServiceUrl(
           browser_sync::kSyncLegacyServiceUrl);
     }
     talk_mediator_->AddSubscribedServiceUrl(browser_sync::kSyncServiceUrl);
   }
 
   // Listen to TalkMediator events ourselves
   talk_mediator_->SetDelegate(this);
 
@@ skipping 68 matching lines @@
   }
 
   // Notify that initialization is complete.
   if (observer_)
     observer_->OnInitializationComplete();
 }
 
 void SyncManager::SyncInternal::SendPendingXMPPNotification(
     bool new_pending_notification) {
   DCHECK_EQ(MessageLoop::current(), core_message_loop_);
+  DCHECK_NE(notification_method_, browser_sync::NOTIFICATION_SERVER);
   notification_pending_ = notification_pending_ || new_pending_notification;
   if (!notification_pending_) {
     LOG(INFO) << "Not sending notification: no pending notification";
     return;
   }
   if (!talk_mediator_.get()) {
     LOG(INFO) << "Not sending notification: shutting down "
               << "(talk_mediator_ is NULL)";
     return;
   }
@@ skipping 373 matching lines @@
   // locally we are "all happy" and up-to-date.  There may be new changes on
   // the server, but we'll get them on a subsequent sync.
   //
   // Notifications are sent at the end of every sync cycle, regardless of
   // whether we should sync again.
   if (event.what_happened == SyncerEvent::SYNC_CYCLE_ENDED) {
     if (!event.snapshot->has_more_to_sync) {
       observer_->OnSyncCycleCompleted(event.snapshot);
     }
 
-    // TODO(chron): Consider changing this back to track has_more_to_sync
-    // only notify peers if a successful commit has occurred.
-    bool new_pending_notification =
-        (event.snapshot->syncer_status.num_successful_commits > 0);
-    core_message_loop_->PostTask(
-        FROM_HERE,
-        NewRunnableMethod(
-            this,
-            &SyncManager::SyncInternal::SendPendingXMPPNotification,
-            new_pending_notification));
+    if (notification_method_ != browser_sync::NOTIFICATION_SERVER) {
+      // TODO(chron): Consider changing this back to track has_more_to_sync
+      // only notify peers if a successful commit has occurred.
+      bool new_pending_notification =
+          (event.snapshot->syncer_status.num_successful_commits > 0);
+      core_message_loop_->PostTask(
+          FROM_HERE,
+          NewRunnableMethod(
+              this,
+              &SyncManager::SyncInternal::SendPendingXMPPNotification,
+              new_pending_notification));
+    }
   }
 
   if (event.what_happened == SyncerEvent::PAUSED) {
     observer_->OnPaused();
     return;
   }
 
   if (event.what_happened == SyncerEvent::RESUMED) {
     observer_->OnResumed();
     return;
@@ skipping 102 matching lines @@
 }
 
 void SyncManager::SyncInternal::OnNotificationStateChange(
     bool notifications_enabled) {
   LOG(INFO) << "P2P: Notifications enabled = "
             << (notifications_enabled ? "true" : "false");
   allstatus_.SetNotificationsEnabled(notifications_enabled);
   if (syncer_thread()) {
     syncer_thread()->SetNotificationsEnabled(notifications_enabled);
   }
-  if (notifications_enabled) {
+  if ((notification_method_ != browser_sync::NOTIFICATION_SERVER) &&
+      notifications_enabled) {
     // Send a notification as soon as subscriptions are on
     // (see http://code.google.com/p/chromium/issues/detail?id=38563 ).
     core_message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(
             this,
             &SyncManager::SyncInternal::SendPendingXMPPNotification,
             true));
   }
 }
@@ skipping 103 matching lines @@
 UserShare* SyncManager::GetUserShare() const {
   DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
   return data_->GetUserShare();
 }
 
 SyncManager::ExtraAutofillChangeRecordData::~ExtraAutofillChangeRecordData() {
   delete pre_deletion_data;
 }
 
 }  // namespace sync_api