sync: Display protocol events on about:sync

chrome/browser/ui/webui/sync_internals_message_handler.cc

 // Copyright 2014 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/sync_internals_message_handler.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/about_sync_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_ui.h"
+#include "sync/internal_api/public/events/protocol_event.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/js/js_arg_list.h"
 #include "sync/js/js_event_details.h"
 
 using syncer::JsArgList;
 using syncer::JsEventDetails;
 using syncer::JsReplyHandler;
 using syncer::ModelTypeSet;
 using syncer::WeakHandle;
 
 SyncInternalsMessageHandler::SyncInternalsMessageHandler()
-    : scoped_observer_(this),
-      weak_ptr_factory_(this) {}
+    : weak_ptr_factory_(this) {}
 
 SyncInternalsMessageHandler::~SyncInternalsMessageHandler() {
   if (js_controller_)
     js_controller_->RemoveJsEventHandler(this);
+
+  ProfileSyncService* service = GetProfileSyncService();
+  if (service && service->HasObserver(this)) {
+    service->RemoveObserver(this);
+    service->RemoveProtocolEventObserver(this);
+  }
 }
 
 void SyncInternalsMessageHandler::RegisterMessages() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   // Register for ProfileSyncService events.
   ProfileSyncService* service = GetProfileSyncService();
   if (service) {
-    scoped_observer_.Add(service);
+    service->AddObserver(this);
+    service->AddProtocolEventObserver(this);
     js_controller_ = service->GetJsController();
     js_controller_->AddJsEventHandler(this);
   }
 
   web_ui()->RegisterMessageCallback(
       "requestUpdatedAboutInfo",
       base::Bind(&SyncInternalsMessageHandler::HandleRequestUpdatedAboutInfo,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
@@ skipping 35 matching lines @@
   const std::string& reply_handler = "chrome.sync." + name + ".handleReply";
   std::vector<const base::Value*> arg_list(args.Get().begin(),
                                            args.Get().end());
   web_ui()->CallJavascriptFunction(reply_handler, arg_list);
 }
 
 void SyncInternalsMessageHandler::OnStateChanged() {
   SendAboutInfo();
 }
 
+void SyncInternalsMessageHandler::OnProtocolEvent(
+    const syncer::ProtocolEvent& event) {
+  scoped_ptr<base::DictionaryValue> value(
+      syncer::ProtocolEvent::ToValue(event));
+  web_ui()->CallJavascriptFunction(
+      "chrome.sync.dispatchEvent",
+      base::StringValue("onProtocolEvent"),
+      *value);
+}
+
 void SyncInternalsMessageHandler::HandleJsEvent(
     const std::string& name,
     const JsEventDetails& details) {
   DVLOG(1) << "Handling event: " << name
            << " with details " << details.ToString();
   web_ui()->CallJavascriptFunction("chrome.sync.dispatchEvent",
                                    base::StringValue(name),
                                    details.Get());
 }
 
@@ skipping 30 matching lines @@
 }
 
 // Gets the ProfileSyncService of the underlying original profile.
 // May return NULL (e.g., if sync is disabled on the command line).
 ProfileSyncService* SyncInternalsMessageHandler::GetProfileSyncService() {
   Profile* profile = Profile::FromWebUI(web_ui());
   ProfileSyncServiceFactory* factory = ProfileSyncServiceFactory::GetInstance();
   return factory->GetForProfile(profile->GetOriginalProfile());
 }