Make Web Push use InstanceID tokens instead of GCM registrations

components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h

Index: components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h
diff --git a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h
index c8e9ab7eb9c3efe6428f2c2229eeb37e3a93012e..1431c60218d6dff742dece2bb5ea7e78dc486c1b 100644
--- a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h
+++ b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h
@@ -13,12 +13,18 @@
 #include "base/macros.h"
 #include "components/gcm_driver/fake_gcm_driver.h"
 
+namespace base {
+class SequencedTaskRunner;
+}
+
 namespace instance_id {
 
 class FakeGCMDriverForInstanceID : public gcm::FakeGCMDriver,
                                    public gcm::InstanceIDHandler {
  public:
   FakeGCMDriverForInstanceID();
+  explicit FakeGCMDriverForInstanceID(
+      const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
   ~FakeGCMDriverForInstanceID() override;
 
   // FakeGCMDriver overrides:
@@ -42,9 +48,19 @@ class FakeGCMDriverForInstanceID : public gcm::FakeGCMDriver,
       const std::string& app_id,
       const GetInstanceIDDataCallback& callback) override;
 
+  const std::string& last_registered_app_id() const {

[Peter Beverloo, 2016/04/21 13:26:19]

Bikeshedding:
  last_instanceid_token_app_id?
  last_instanceid_token_authorized_entity?

To ambiguate between registration and InstanceID tokens..

[johnme, 2016/05/25 14:11:51]

Renamed to last_gettoken_*

+    return last_registered_app_id_;
+  }
+
+  const std::string& last_registered_authorized_entity() const {
+    return last_registered_authorized_entity_;
+  }
+
  private:
   std::map<std::string, std::pair<std::string, std::string>> instance_id_data_;
   std::map<std::string, std::string> tokens_;
+  std::string last_registered_app_id_;
+  std::string last_registered_authorized_entity_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeGCMDriverForInstanceID);
 };