Add shutdown notification and service refs to SyncServiceObserver.

chrome/browser/ui/webui/options/clear_browser_data_handler.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 "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 65 matching lines @@
       sync_service_(nullptr),
       should_show_history_notice_(false),
       should_show_history_deletion_dialog_(false),
       weak_ptr_factory_(this) {
 }
 
 ClearBrowserDataHandler::~ClearBrowserDataHandler() {
   if (remover_)
     remover_->RemoveObserver(this);
   if (sync_service_)
     sync_service_->RemoveObserver(this);

[skym, 2017/01/26 23:43:23]

So many of these uses could benefit from the ScopedObserver you used in your
other CL. Of course, far outside the scope of this CL.

 }
 
 void ClearBrowserDataHandler::InitializeHandler() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled, prefs);
   allow_deleting_browser_history_.Init(
       prefs::kAllowDeletingBrowserHistory,
       prefs,
       base::Bind(&ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged,
                  base::Unretained(this)));
@@ skipping 287 matching lines @@
 
 void ClearBrowserDataHandler::UpdateCounterText(
     std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
   DCHECK(AreCountersEnabled());
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.updateCounter",
       base::StringValue(result->source()->GetPrefName()),
       base::StringValue(GetChromeCounterTextFromResult(result.get())));
 }
 
-void ClearBrowserDataHandler::OnStateChanged() {
+void ClearBrowserDataHandler::OnStateChanged(syncer::SyncService* sync) {
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.updateSyncWarningAndHistoryFooter",
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()),
       base::FundamentalValue(should_show_history_notice_));
 }
 
 void ClearBrowserDataHandler::RefreshHistoryNotice() {
   browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
       sync_service_,
       WebHistoryServiceFactory::GetForProfile(Profile::FromWebUI(web_ui())),
@@ skipping 24 matching lines @@
       "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated",
       should_show_history_notice_);
 }
 
 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) {
   // This is used by OnBrowsingDataRemoverDone (when the deletion finishes).
   should_show_history_deletion_dialog_ = show;
 }
 
 }  // namespace options