sync: Display protocol events on about:sync

chrome/browser/ui/webui/sync_internals_message_handler.h

Index: chrome/browser/ui/webui/sync_internals_message_handler.h
diff --git a/chrome/browser/ui/webui/sync_internals_message_handler.h b/chrome/browser/ui/webui/sync_internals_message_handler.h
index 902c1d60d33ce8f780c6adf789018b86e6b2bb55..806e25d6455c40cbec81a17ea9190f73c8cc5581 100644
--- a/chrome/browser/ui/webui/sync_internals_message_handler.h
+++ b/chrome/browser/ui/webui/sync_internals_message_handler.h
@@ -13,6 +13,7 @@
 #include "base/scoped_observer.h"
 #include "base/values.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
+#include "chrome/browser/sync/protocol_event_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "sync/js/js_controller.h"
 #include "sync/js/js_event_handler.h"
@@ -25,7 +26,8 @@ class SyncInternalsMessageHandler
     : public content::WebUIMessageHandler,
       public syncer::JsEventHandler,
       public syncer::JsReplyHandler,
-      public ProfileSyncServiceObserver {
+      public ProfileSyncServiceObserver,
+      public browser_sync::ProtocolEventObserver {
  public:
   SyncInternalsMessageHandler();
   virtual ~SyncInternalsMessageHandler();
@@ -54,6 +56,9 @@ class SyncInternalsMessageHandler
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
 
+  // ProtocolEventObserver implementation.
+  virtual void OnProtocolEvent(const syncer::ProtocolEvent& e) OVERRIDE;
+
  private:
   // Helper function to register JsController function callbacks.
   void RegisterJsControllerCallback(const std::string& name);
@@ -64,9 +69,6 @@ class SyncInternalsMessageHandler
 
   ProfileSyncService* GetProfileSyncService();
 
-  ScopedObserver<ProfileSyncService, SyncInternalsMessageHandler>
-      scoped_observer_;
-
   base::WeakPtr<syncer::JsController> js_controller_;
   base::WeakPtrFactory<SyncInternalsMessageHandler> weak_ptr_factory_;