Add shutdown notification and service refs to SyncServiceObserver.

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 3490fe533c87e63d932622dfeca69f3d4ffcb867..589e3b7e927d52b0c5ac18504a053b7bede27a34 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -947,19 +947,19 @@ void BrowserOptionsHandler::Uninitialize() {
 #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() {
@@ -1122,7 +1122,7 @@ void BrowserOptionsHandler::InitializePage() {
   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
@@ -1374,7 +1374,7 @@ void BrowserOptionsHandler::Observe(
       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();