[Sync] Propagate XMPP auth errors to SyncNotifierObservers

sync/notifier/p2p_notifier_unittest.cc

 // 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/p2p_notifier.h"
 
 #include <cstddef>
 
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "sync/internal_api/public/syncable/model_type.h"
@@ skipping 127 matching lines @@
 }
 
 // Set up the P2PNotifier, simulate a successful connection, and send
 // a notification with the default target (NOTIFY_OTHERS).  The
 // observer should receive only a notification from the call to
 // UpdateEnabledTypes().
 TEST_F(P2PNotifierTest, NotificationsBasic) {
   syncable::ModelTypeSet enabled_types(
       syncable::BOOKMARKS, syncable::PREFERENCES);
 
-  EXPECT_CALL(mock_observer_, OnNotificationStateChange(true));
+  EXPECT_CALL(mock_observer_, OnSyncNotifierStateChange(NOTIFICATIONS_ON));
   EXPECT_CALL(mock_observer_,
               OnIncomingNotification(MakePayloadMap(enabled_types),
                                      REMOTE_NOTIFICATION));
 
   p2p_notifier_.SetUniqueId("sender");
 
   const char kEmail[] = "foo@bar.com";
   const char kToken[] = "token";
   p2p_notifier_.UpdateCredentials(kEmail, kToken);
   {
     notifier::Subscription expected_subscription;
     expected_subscription.channel = kSyncP2PNotificationChannel;
     expected_subscription.from = kEmail;
     EXPECT_TRUE(notifier::SubscriptionListsEqual(
         fake_push_client_->subscriptions(),
         notifier::SubscriptionList(1, expected_subscription)));
   }
   EXPECT_EQ(kEmail, fake_push_client_->email());
   EXPECT_EQ(kToken, fake_push_client_->token());
 
   p2p_notifier_.UpdateEnabledTypes(enabled_types);
 
   ReflectSentNotifications();
-  fake_push_client_->SimulateNotificationStateChange(true);
+  fake_push_client_->SimulatePushClientStateChange(
+      notifier::NOTIFICATIONS_ON);
 
   // Sent with target NOTIFY_OTHERS so should not be propagated to
   // |mock_observer_|.
   {
     syncable::ModelTypeSet changed_types(
         syncable::THEMES, syncable::APPS);
     p2p_notifier_.SendNotification(changed_types);
   }
 
   ReflectSentNotifications();
 }
 
 // Set up the P2PNotifier and send out notifications with various
 // target settings.  The notifications received by the observer should
 // be consistent with the target settings.
 TEST_F(P2PNotifierTest, SendNotificationData) {
   syncable::ModelTypeSet enabled_types(
       syncable::BOOKMARKS, syncable::PREFERENCES);
 
   syncable::ModelTypeSet changed_types(
       syncable::THEMES, syncable::APPS);
 
   const syncable::ModelTypePayloadMap& changed_payload_map =
       MakePayloadMap(changed_types);
 
-  EXPECT_CALL(mock_observer_, OnNotificationStateChange(true));
+  EXPECT_CALL(mock_observer_, OnSyncNotifierStateChange(NOTIFICATIONS_ON));
   EXPECT_CALL(mock_observer_,
               OnIncomingNotification(MakePayloadMap(enabled_types),
                                      REMOTE_NOTIFICATION));
 
   p2p_notifier_.SetUniqueId("sender");
   p2p_notifier_.UpdateCredentials("foo@bar.com", "fake_token");
   p2p_notifier_.UpdateEnabledTypes(enabled_types);
 
   ReflectSentNotifications();
-  fake_push_client_->SimulateNotificationStateChange(true);
+  fake_push_client_->SimulatePushClientStateChange(
+      notifier::NOTIFICATIONS_ON);
 
   ReflectSentNotifications();
 
   // Should be dropped.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   p2p_notifier_.SendNotificationDataForTest(P2PNotificationData());
 
   ReflectSentNotifications();
 
   // Should be propagated.
@@ skipping 63 matching lines @@
   Mock::VerifyAndClearExpectations(&mock_observer_);
   p2p_notifier_.SendNotificationDataForTest(
       P2PNotificationData("sender2", NOTIFY_ALL, syncable::ModelTypeSet()));
 
   ReflectSentNotifications();
 }
 
 }  // namespace
 
 }  // namespace sync_notifier