[Sync] Move 'sync_notifier' target to sync/

Also move related test files.

Remove some unneeded includes.

Lock down deps for sync/notifier.

Clean up some deps in chrome/browser/sync.

BUG=117585,124139
TEST=


Review URL: http://codereview.chromium.org/10115046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132990 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 150 insertions, 0 deletions

diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
new file mode 100644
index 0000000..f9ab44d
--- /dev/null
+++ b/sync/notifier/invalidation_notifier.cc
@@ -0,0 +1,150 @@
+// 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.
+
+#include "sync/notifier/invalidation_notifier.h"
+
+#include "base/logging.h"
+#include "base/message_loop_proxy.h"
+#include "jingle/notifier/base/const_communicator.h"
+#include "jingle/notifier/base/notifier_options_util.h"
+#include "jingle/notifier/communicator/connection_options.h"
+#include "net/url_request/url_request_context.h"
+#include "sync/notifier/sync_notifier_observer.h"
+#include "sync/protocol/service_constants.h"
+#include "sync/syncable/model_type_payload_map.h"
+#include "talk/xmpp/jid.h"
+#include "talk/xmpp/xmppclientsettings.h"
+
+namespace sync_notifier {
+
+InvalidationNotifier::InvalidationNotifier(
+    const notifier::NotifierOptions& notifier_options,
+    const InvalidationVersionMap& initial_max_invalidation_versions,
+    const browser_sync::WeakHandle<InvalidationVersionTracker>&
+        invalidation_version_tracker,
+    const std::string& client_info)
+    : state_(STOPPED),
+      notifier_options_(notifier_options),
+      initial_max_invalidation_versions_(initial_max_invalidation_versions),
+      invalidation_version_tracker_(invalidation_version_tracker),
+      client_info_(client_info) {
+  DCHECK_EQ(notifier::NOTIFICATION_SERVER,
+            notifier_options.notification_method);
+  DCHECK(notifier_options_.request_context_getter);
+  // TODO(akalin): Replace NonThreadSafe checks with IO thread checks.
+  DCHECK(notifier_options_.request_context_getter->GetIOMessageLoopProxy()->
+      BelongsToCurrentThread());
+}
+
+InvalidationNotifier::~InvalidationNotifier() {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+}
+
+void InvalidationNotifier::AddObserver(SyncNotifierObserver* observer) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  observers_.AddObserver(observer);
+}
+
+void InvalidationNotifier::RemoveObserver(SyncNotifierObserver* observer) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  observers_.RemoveObserver(observer);
+}
+
+void InvalidationNotifier::SetUniqueId(const std::string& unique_id) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  invalidation_client_id_ = unique_id;
+  DVLOG(1) << "Setting unique ID to " << unique_id;
+  CHECK(!invalidation_client_id_.empty());
+}
+
+void InvalidationNotifier::SetState(const std::string& state) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  invalidation_state_ = state;
+  DVLOG(1) << "Setting new state";
+}
+
+void InvalidationNotifier::UpdateCredentials(
+    const std::string& email, const std::string& token) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  CHECK(!invalidation_client_id_.empty());
+  DVLOG(1) << "Updating credentials for " << email;
+  buzz::XmppClientSettings xmpp_client_settings =
+      notifier::MakeXmppClientSettings(notifier_options_,
+                                       email, token, SYNC_SERVICE_NAME);
+  if (state_ >= CONNECTING) {
+    login_->UpdateXmppSettings(xmpp_client_settings);
+  } else {
+    notifier::ConnectionOptions options;
+    DVLOG(1) << "First time updating credentials: connecting";
+    login_.reset(
+        new notifier::Login(this,
+                            xmpp_client_settings,
+                            notifier::ConnectionOptions(),
+                            notifier_options_.request_context_getter,
+                            notifier::GetServerList(notifier_options_),
+                            notifier_options_.try_ssltcp_first,
+                            notifier_options_.auth_mechanism));
+    login_->StartConnection();
+    state_ = CONNECTING;
+  }
+}
+
+void InvalidationNotifier::UpdateEnabledTypes(
+    syncable::ModelTypeSet enabled_types) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  CHECK(!invalidation_client_id_.empty());
+  invalidation_client_.RegisterTypes(enabled_types);
+}
+
+void InvalidationNotifier::SendNotification(
+    syncable::ModelTypeSet changed_types) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  // Do nothing.
+}
+
+void InvalidationNotifier::OnConnect(
+    base::WeakPtr<buzz::XmppTaskParentInterface> base_task) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DVLOG(1) << "OnConnect";
+  if (state_ >= STARTED) {
+    invalidation_client_.ChangeBaseTask(base_task);
+  } else {
+    DVLOG(1) << "First time connecting: starting invalidation client with id "
+             << invalidation_client_id_ << " and client info "
+             << client_info_;
+    invalidation_client_.Start(
+        invalidation_client_id_, client_info_, invalidation_state_,
+        initial_max_invalidation_versions_,
+        invalidation_version_tracker_,
+        this, this, base_task);
+    invalidation_state_.clear();
+    state_ = STARTED;
+  }
+}
+
+void InvalidationNotifier::OnDisconnect() {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DVLOG(1) << "OnDisconnect";
+}
+
+void InvalidationNotifier::OnInvalidate(
+    const syncable::ModelTypePayloadMap& type_payloads) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
+                    OnIncomingNotification(type_payloads,
+                                           sync_notifier::REMOTE_NOTIFICATION));
+}
+
+void InvalidationNotifier::OnSessionStatusChanged(bool has_session) {
+  FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
+                    OnNotificationStateChange(has_session));
+}
+
+void InvalidationNotifier::WriteState(const std::string& state) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DVLOG(1) << "WriteState";
+  FOR_EACH_OBSERVER(SyncNotifierObserver, observers_, StoreState(state));
+}
+
+}  // namespace sync_notifier