chrome/browser/services/gcm/fake_gcm_profile_service.cc - Issue 1851423003: Make Web Push use InstanceID tokens instead of GCM registrations

Unified Diff: chrome/browser/services/gcm/fake_gcm_profile_service.cc

Issue 1851423003: Make Web Push use InstanceID tokens instead of GCM registrations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid4default

Patch Set: Address review comments, and rewrite following rebase (e.g. no longer depends on NestedMessagePumpA… Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/push_messaging/push_messaging_service_impl.cc ('K') | « chrome/browser/push_messaging/push_messaging_service_unittest.cc ('k') | components/gcm_driver/android/BUILD.gn » ('j') | components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/services/gcm/fake_gcm_profile_service.cc

diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.cc b/chrome/browser/services/gcm/fake_gcm_profile_service.cc

index ba20c64b36c2ec9a73602e86d31e077045bacede..07684ef05122b72d0229a49b1f69ffaba4656693 100644

--- a/chrome/browser/services/gcm/fake_gcm_profile_service.cc

+++ b/chrome/browser/services/gcm/fake_gcm_profile_service.cc

@@ -16,15 +16,14 @@

#include "base/thread_task_runner_handle.h"

#include "chrome/browser/profiles/profile.h"

#include "components/gcm_driver/fake_gcm_client_factory.h"

-#include "components/gcm_driver/fake_gcm_driver.h"

-#include "components/gcm_driver/gcm_driver.h"

+#include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"

#include "content/public/browser/browser_context.h"

namespace gcm {

namespace {

-class CustomFakeGCMDriver : public FakeGCMDriver {

+class CustomFakeGCMDriver : public instance_id::FakeGCMDriverForInstanceID {

Peter Beverloo 2016/04/21 13:26:19 Can we remove the driver override from the Instanc

johnme 2016/05/25 14:11:51 Done.

public:

explicit CustomFakeGCMDriver(FakeGCMProfileService* service);

~CustomFakeGCMDriver() override;

@@ -42,7 +41,7 @@ class CustomFakeGCMDriver : public FakeGCMDriver {

const IncomingMessage& message);

protected:

- // FakeGCMDriver overrides:

+ // FakeGCMDriverForInstanceID overrides:

void RegisterImpl(const std::string& app_id,

const std::vector<std::string>& sender_ids) override;

void UnregisterImpl(const std::string& app_id) override;

@@ -59,9 +58,9 @@ class CustomFakeGCMDriver : public FakeGCMDriver {

};

CustomFakeGCMDriver::CustomFakeGCMDriver(FakeGCMProfileService* service)

- : FakeGCMDriver(base::ThreadTaskRunnerHandle::Get()),

- service_(service) {

+ : instance_id::FakeGCMDriverForInstanceID(

+ base::ThreadTaskRunnerHandle::Get()),

+ service_(service) {}

CustomFakeGCMDriver::~CustomFakeGCMDriver() {

}