Enable auto-refreshing of the gcm-internals page whenever a GCM activity is recorded, and fix a bug…

chrome/browser/services/gcm/gcm_service.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/services/gcm/gcm_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 128 matching lines @@
                               const std::string& message_id,
                               GCMClient::Result result) OVERRIDE;
   virtual void OnMessageReceived(
       const std::string& app_id,
       const GCMClient::IncomingMessage& message) OVERRIDE;
   virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE;
   virtual void OnMessageSendError(
       const std::string& app_id,
       const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
   virtual void OnGCMReady() OVERRIDE;
+  virtual void OnActivityRecorded() OVERRIDE;
 
   // Called on IO thread.
   void Initialize(scoped_ptr<GCMClientFactory> gcm_client_factory,
                   const base::FilePath& store_path,
                   const std::vector<std::string>& account_ids,
                   const scoped_refptr<net::URLRequestContextGetter>&
                       url_request_context_getter);
   void Load(const base::WeakPtr<GCMService>& service);
   void Stop();
   void CheckOut();
@@ skipping 130 matching lines @@
                                               send_error_details));
 }
 
 void GCMService::IOWorker::OnGCMReady() {
   content::BrowserThread::PostTask(content::BrowserThread::UI,
                                    FROM_HERE,
                                    base::Bind(&GCMService::GCMClientReady,
                                               service_));
 }
 
+void GCMService::IOWorker::OnActivityRecorded() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  // When an activity is recorded, get all the stats and refresh the UI of
+  // gcm-internals page.
+  GetGCMStatistics(false);
+}
+
 void GCMService::IOWorker::Load(const base::WeakPtr<GCMService>& service) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
   service_ = service;
   gcm_client_->Load();
 }
 
 void GCMService::IOWorker::Stop() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
@@ skipping 528 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   std::map<std::string, GCMAppHandler*>::const_iterator iter =
       app_handlers_.find(app_id);
   return iter == app_handlers_.end() ? &default_app_handler_ : iter->second;
 }
 
 void GCMService::GetGCMStatisticsFinished(
     GCMClient::GCMStatistics stats) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  request_gcm_statistics_callback_.Run(stats);
+  if (!request_gcm_statistics_callback_.is_null())

[jianli, 2014/05/09 17:26:27]

Please comment on why the callback could be NULL.

[juyik, 2014/05/09 18:40:04]

Normally it would not be NULL, unless it is triggered by other bugs. I have
added comments and logged a warning if it is null.

+    request_gcm_statistics_callback_.Run(stats);
 }
 
 }  // namespace gcm