Hook PushMessagingMessageFilter up to GCMDriver

chrome/browser/services/gcm/gcm_profile_service.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/services/gcm/push_messaging_service_impl.h"
 // TODO(jianli): include needed for obsolete methods that are going to be
 // removed soon.
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class Profile;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
@@ skipping 24 matching lines @@
                 const GCMDriver::RegisterCallback& callback);
 
   // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
   // For testing purpose.
   void SetDriverForTesting(GCMDriver* driver);
 
   GCMDriver* driver() const { return driver_.get(); }
 
+  content::PushMessagingService* push_messaging_service() {

[jianli, 2014/06/06 17:32:20]

nit: add const modifier

[johnme, 2014/06/06 18:48:24]

Done.

[johnme, 2014/06/09 19:04:45]

Actually, I replied too soon - I had to remove the const modifier because when a
const method takes a reference to a non-mutable member variable, the pointer you
get is a const pointer, so compile failed trying to cast "const
PushMessagingServiceImpl*" to "content::PushMessagingService*". I could add a
const_cast or mark push_messaging_service_ as mutable, but actually I disagree
that this method should be const, since the returned PushMessagingService lets
you mutate GCMDriver, which is part of the state of GCMProfileService. In a old
chromium-dev thread[1], there seemed to be rough agreement that in general const
methods should not return non-const pointers. So I think having this non-const
is correct, and for consistency we should make driver() be non-const (which
doesn't break any existing code), though I'll leave that for a separate patch.

[1]:
https://groups.google.com/a/chromium.org/d/topic/chromium-dev/zvd-z8U_u1I/dis...

+    return &push_messaging_service_;
+  }
+
  protected:
   // Used for constructing fake GCMProfileService for testing purpose.
   GCMProfileService();
 
  private:
   // The profile which owns this object.
   Profile* profile_;
 
   scoped_ptr<GCMDriver> driver_;
 
+  // Implementation of content::PushMessagingService using GCMProfileService.
+  PushMessagingServiceImpl push_messaging_service_;
+
   DISALLOW_COPY_AND_ASSIGN(GCMProfileService);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_