Add shutdown notification and service refs to SyncServiceObserver.

chrome/browser/ui/webui/options/browser_options_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/browser_options_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 929 matching lines @@
 #endif
 #if defined(OS_CHROMEOS)
   ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(
       Profile::FromWebUI(web_ui()));
   if (arc_prefs)
     arc_prefs->RemoveObserver(this);
   user_manager::UserManager::Get()->RemoveObserver(this);
 #endif
 }
 
-void BrowserOptionsHandler::OnStateChanged() {
+void BrowserOptionsHandler::OnStateChanged(syncer::SyncService* sync) {
   UpdateSyncState();
 }
 
 void BrowserOptionsHandler::GoogleSigninSucceeded(const std::string& account_id,
                                                   const std::string& username,
                                                   const std::string& password) {
-  OnStateChanged();
+  OnStateChanged(NULL);

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

Should use nullptr, not NULL. I'm not familiar at all with this code, but it
might make more sense to call UpdateSyncState() everywhere. OnStateChange() is
really generic sounding, doesn't give as much context to the call sites.

[Steven Holte, 2017/01/27 02:27:19]

Changed to UpdateSyncState().

 }
 
 void BrowserOptionsHandler::GoogleSignedOut(const std::string& account_id,
                                             const std::string& username) {
-  OnStateChanged();
+  OnStateChanged(NULL);

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

Same as above.

[Steven Holte, 2017/01/27 02:27:19]

Done.

 }
 
 void BrowserOptionsHandler::PageLoadStarted() {
   page_initialized_ = false;
 }
 
 void BrowserOptionsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
   ChromeZoomLevelPrefs* zoom_level_prefs = profile->GetZoomLevelPrefs();
@@ skipping 142 matching lines @@
       base::Bind(&BrowserOptionsHandler::SetupSafeBrowsingExtendedReporting,
                  base::Unretained(this)));
 }
 
 void BrowserOptionsHandler::InitializePage() {
   page_initialized_ = true;
 
   OnTemplateURLServiceChanged();
 
   ObserveThemeChanged();
-  OnStateChanged();
+  OnStateChanged(NULL);

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

Same as above.

[Steven Holte, 2017/01/27 02:27:19]

Done.

 #if !defined(OS_CHROMEOS)
   UpdateDefaultBrowserState();
 #endif
 
   SetupMetricsReportingSettingVisibility();
   SetupMetricsReportingCheckbox();
   SetupNetworkPredictionControl();
   SetupFontSizeSelector();
   SetupPageZoomSelector();
   SetupAutoOpenFileTypes();
@@ skipping 231 matching lines @@
   // InitializePage() will update the UI at the end of the load).
   if (!page_initialized_)
     return;
 
   switch (type) {
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED:
       ObserveThemeChanged();
       break;
     case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
       // Update our sync/signin status display.
-      OnStateChanged();
+      OnStateChanged(NULL);

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

Same as above.

[Steven Holte, 2017/01/27 02:27:19]

Done.

       break;
     default:
       NOTREACHED();
   }
 }
 
 void BrowserOptionsHandler::OnProfileAdded(const base::FilePath& profile_path) {
   SendProfilesInfo();
 }
 
@@ skipping 912 matching lines @@
 
 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
 #if defined(OS_CHROMEOS)
   return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
 #else
   return true;
 #endif
 }
 
 }  // namespace options