Add shutdown notification and service refs to SyncServiceObserver.

components/ntp_snippets/sessions/tab_delegate_sync_adapter_unittest.cc

 // Copyright 2016 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 "components/ntp_snippets/sessions/tab_delegate_sync_adapter.h"
 
 #include <string>
 
 #include "base/macros.h"
 #include "components/sync/driver/fake_sync_service.h"
@@ skipping 39 matching lines @@
   MOCK_METHOD2(GetForeignSessionTabs,
                bool(const std::string&, std::vector<const SessionTab*>*));
   MOCK_METHOD1(GetLocalSession, bool(const SyncedSession**));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockOpenTabsUIDelegate);
 };
 
 class TabDelegateSyncAdapterTest : public Test {
  public:
-  TabDelegateSyncAdapterTest() : adapter_(&service_) {
+  TabDelegateSyncAdapterTest() : adapter_(service()) {
     adapter_.SubscribeForForeignTabChange(base::Bind(
         &TabDelegateSyncAdapterTest::OnChange, base::Unretained(this)));
   }
 
+  syncer::SyncService* service() { return &service_; }
   SyncServiceObserver* observer() { return &adapter_; }
 
   void SetHasOpenTabs(bool is_enabled) {
     service_.tabs_ = is_enabled ? &tabs_ : nullptr;
   }
 
   void OnChange() { ++callback_count_; }
 
   int CallbackCount() { return callback_count_; }
 
  private:
   MockOpenTabsUIDelegate tabs_;
   TestSyncService service_;
   TabDelegateSyncAdapter adapter_;
   int callback_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(TabDelegateSyncAdapterTest);
 };
 
 // CallbackCount should only trigger on transitions between having and not
 // having open tabs.
 TEST_F(TabDelegateSyncAdapterTest, CallbackCount) {
   ASSERT_EQ(0, CallbackCount());
-  observer()->OnStateChanged();
+  observer()->OnStateChanged(service());
   EXPECT_EQ(0, CallbackCount());
 
   SetHasOpenTabs(true);
-  observer()->OnStateChanged();
+  observer()->OnStateChanged(service());
   EXPECT_EQ(1, CallbackCount());
-  observer()->OnStateChanged();
+  observer()->OnStateChanged(service());
   EXPECT_EQ(1, CallbackCount());
 
   SetHasOpenTabs(false);
-  observer()->OnStateChanged();
+  observer()->OnStateChanged(service());
   EXPECT_EQ(2, CallbackCount());
-  observer()->OnStateChanged();
+  observer()->OnStateChanged(service());
   EXPECT_EQ(2, CallbackCount());
 
   // OnSyncCycleCompleted should behave like OnStateChanged.
-  observer()->OnSyncCycleCompleted();
+  observer()->OnSyncCycleCompleted(service());
   EXPECT_EQ(2, CallbackCount());
   SetHasOpenTabs(true);
-  observer()->OnSyncCycleCompleted();
+  observer()->OnSyncCycleCompleted(service());
   EXPECT_EQ(3, CallbackCount());
-  observer()->OnSyncCycleCompleted();
+  observer()->OnSyncCycleCompleted(service());
   EXPECT_EQ(3, CallbackCount());
 }
 
 // No callback should be invoked from OnSyncConfigurationCompleted.
 TEST_F(TabDelegateSyncAdapterTest, OnSyncConfigurationCompleted) {
   ASSERT_EQ(0, CallbackCount());
 
-  observer()->OnSyncConfigurationCompleted();
+  observer()->OnSyncConfigurationCompleted(service());
   EXPECT_EQ(0, CallbackCount());
 
   SetHasOpenTabs(true);
-  observer()->OnSyncConfigurationCompleted();
+  observer()->OnSyncConfigurationCompleted(service());
   EXPECT_EQ(0, CallbackCount());
 }
 
 // OnForeignSessionUpdated should always trigger a callback.
 TEST_F(TabDelegateSyncAdapterTest, OnForeignSessionUpdated) {
   ASSERT_EQ(0, CallbackCount());
-  observer()->OnForeignSessionUpdated();
+  observer()->OnForeignSessionUpdated(service());
   EXPECT_EQ(1, CallbackCount());
-  observer()->OnForeignSessionUpdated();
+  observer()->OnForeignSessionUpdated(service());
   EXPECT_EQ(2, CallbackCount());
 
   SetHasOpenTabs(true);
-  observer()->OnForeignSessionUpdated();
+  observer()->OnForeignSessionUpdated(service());
   EXPECT_EQ(3, CallbackCount());
-  observer()->OnForeignSessionUpdated();
+  observer()->OnForeignSessionUpdated(service());
   EXPECT_EQ(4, CallbackCount());
 }
 
 // If OnForeignSessionUpdated is called before OnStateChanged, then calling
 // OnStateChanged should not trigger a callback.
 TEST_F(TabDelegateSyncAdapterTest, OnForeignSessionUpdatedUpdatesState) {
   SetHasOpenTabs(true);
-  observer()->OnForeignSessionUpdated();
+  observer()->OnForeignSessionUpdated(service());
   EXPECT_EQ(1, CallbackCount());
 
-  observer()->OnStateChanged();
+  observer()->OnStateChanged(service());
   EXPECT_EQ(1, CallbackCount());
 }
 
 }  // namespace
 }  // namespace ntp_snippets