Make Web Push use InstanceID tokens instead of GCM registrations

chrome/browser/push_messaging/push_messaging_service_unittest.cc

 // Copyright 2015 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 "content/public/browser/push_messaging_service.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
 #include "chrome/browser/push_messaging/push_messaging_permission_context.h"
 #include "chrome/browser/push_messaging/push_messaging_permission_context_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/gcm_driver/crypto/gcm_crypto_test_helpers.h"
 #include "components/gcm_driver/fake_gcm_client_factory.h"
 #include "components/gcm_driver/gcm_profile_service.h"
 #include "content/public/common/push_event_payload.h"
 #include "content/public/common/push_subscription_options.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#include "components/gcm_driver/instance_id/instance_id_android.h"
+#endif  // OS_ANDROID
+
 namespace {
 
 const char kTestOrigin[] = "https://example.com";
 const char kTestSenderId[] = "1234567890";
 const int64_t kTestServiceWorkerId = 42;
 const char kTestPayload[] = "Hello, world!";
 
 // Implementation of the TestingProfile that provides the Push Messaging Service
 // and the Permission Manager, both of which are required for the tests.
 class PushMessagingTestingProfile : public TestingProfile {
@@ skipping 37 matching lines @@
 
 scoped_ptr<KeyedService> BuildFakeGCMProfileService(
     content::BrowserContext* context) {
   return gcm::FakeGCMProfileService::Build(static_cast<Profile*>(context));
 }
 
 }  // namespace
 
 class PushMessagingServiceTest : public ::testing::Test {
  public:
-  PushMessagingServiceTest() {
+  PushMessagingServiceTest()
+      : thread_bundle_(
+            content::TestBrowserThreadBundle::NESTED_JAVA_ON_ANDROID),
+        field_trial_list_(nullptr /* entropy_provider */) {
+    base::FieldTrialList::CreateFieldTrial("InstanceID", "Enabled");

[Peter Beverloo, 2016/04/11 15:47:56]

Why are you removing the enable-InstanceID-field-trail code elsewhere, but are
adding it here?

https://codereview.chromium.org/1854093002

[johnme, 2016/04/21 10:58:37]

Hadn't yet rebased this. Removed.

+
     // Override the permission context factory to always allow Push Messaging.
     PushMessagingPermissionContextFactory::GetInstance()->SetTestingFactory(
         &profile_, &BuildFakePushMessagingPermissionContext);
 
     // Override the GCM Profile service so that we can send fake messages.
     gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactory(
         &profile_, &BuildFakeGCMProfileService);
   }
 
   ~PushMessagingServiceTest() override {}
 
+#if defined(OS_ANDROID)
+  void SetUp() override {
+    instance_id::InstanceIDAndroid::ClearDataAndSetUseFakeForTesting(true);
+  }
+  void TearDown() override {
+    instance_id::InstanceIDAndroid::ClearDataAndSetUseFakeForTesting(false);
+  }
+#endif  // OS_ANDROID
+
   // Callback to use when the subscription may have been subscribed.
   void DidRegister(std::string* subscription_id_out,
                    std::vector<uint8_t>* p256dh_out,
                    std::vector<uint8_t>* auth_out,
+                   base::Closure done_callback,
                    const std::string& registration_id,
                    const std::vector<uint8_t>& p256dh,
                    const std::vector<uint8_t>& auth,
                    content::PushRegistrationStatus status) {
-    ASSERT_EQ(content::PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE,
+    EXPECT_EQ(content::PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE,
               status);
 
     *subscription_id_out = registration_id;
     *p256dh_out = p256dh;
     *auth_out = auth;
+
+    done_callback.Run();
   }
 
   // Callback to use when observing messages dispatched by the push service.
   void DidDispatchMessage(std::string* app_id_out,
                           GURL* origin_out,
                           int64_t* service_worker_registration_id_out,
                           content::PushEventPayload* payload_out,
                           const std::string& app_id,
                           const GURL& origin,
                           int64_t service_worker_registration_id,
                           const content::PushEventPayload& payload) {
     *app_id_out = app_id;
     *origin_out = origin;
     *service_worker_registration_id_out = service_worker_registration_id;
     *payload_out = payload;
   }
 
  protected:
   PushMessagingTestingProfile* profile() { return &profile_; }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   PushMessagingTestingProfile profile_;
+  base::FieldTrialList field_trial_list_;
 };
 
 TEST_F(PushMessagingServiceTest, PayloadEncryptionTest) {
   PushMessagingServiceImpl* push_service = profile()->GetPushMessagingService();
   ASSERT_TRUE(push_service);
 
   const GURL origin(kTestOrigin);
 
   // (1) Make sure that |kExampleOrigin| has access to use Push Messaging.
   ASSERT_EQ(blink::WebPushPermissionStatusGranted,
             push_service->GetPermissionStatus(origin, true));
 
   std::string subscription_id;
   std::vector<uint8_t> p256dh, auth;
 
+  base::RunLoop run_loop;
+
   // (2) Subscribe for Push Messaging, and verify that we've got the required
   // information in order to be able to create encrypted messages.
   content::PushSubscriptionOptions options;
   options.user_visible_only = true;
   options.sender_info = kTestSenderId;
   push_service->SubscribeFromWorker(
       origin, kTestServiceWorkerId, options,
       base::Bind(&PushMessagingServiceTest::DidRegister, base::Unretained(this),
-                 &subscription_id, &p256dh, &auth));
+                 &subscription_id, &p256dh, &auth, run_loop.QuitClosure()));
 
   EXPECT_EQ(0u, subscription_id.size());  // this must be asynchronous
 
-  base::RunLoop().RunUntilIdle();
+  run_loop.Run();
 
   ASSERT_GT(subscription_id.size(), 0u);
   ASSERT_GT(p256dh.size(), 0u);
   ASSERT_GT(auth.size(), 0u);
 
   // (3) Encrypt a message using the public key and authentication secret that
   // are associated with the subscription.
 
   gcm::IncomingMessage message;
   message.sender_id = kTestSenderId;
@@ skipping 38 matching lines @@
   // (6) Verify that the message, as received by the Push Messaging Service, has
   // indeed been decrypted by the GCM Driver, and has been forwarded to the
   // Service Worker that has been associated with the subscription.
   EXPECT_EQ(app_identifier.app_id(), app_id);
   EXPECT_EQ(origin, dispatched_origin);
   EXPECT_EQ(service_worker_registration_id, kTestServiceWorkerId);
 
   EXPECT_FALSE(payload.is_null);
   EXPECT_EQ(kTestPayload, payload.data);
 }