Hook up the Push API with GCM's new ability to own encryption keys.

chrome/browser/push_messaging/push_messaging_browsertest.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 <map>
 #include <string>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1076 matching lines @@
 
   run_loop.Run();
 
   // |app_identifier| should no longer be stored in prefs.
   PushMessagingAppIdentifier stored_app_identifier2 =
       PushMessagingAppIdentifier::FindByAppId(GetBrowser()->profile(),
                                               app_identifier.app_id());
   EXPECT_TRUE(stored_app_identifier2.is_null());
 }
 
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, EncryptionKeyUniqueness) {
+  TryToSubscribeSuccessfully("1-0" /* expected_push_subscription_id */);
+
+  std::string first_public_key;
+  ASSERT_TRUE(RunScript("getCurve25519dh()", &first_public_key));
+  EXPECT_GE(first_public_key.size(), 32u);
+
+  std::string script_result;
+  gcm_service()->AddExpectedUnregisterResponse(gcm::GCMClient::SUCCESS);
+  ASSERT_TRUE(RunScript("unsubscribePush()", &script_result));
+  EXPECT_EQ("unsubscribe result: true", script_result);
+
+  TryToSubscribeSuccessfully("1-1" /* expected_push_subscription_id */);
+
+  std::string second_public_key;
+  ASSERT_TRUE(RunScript("getCurve25519dh()", &second_public_key));
+  EXPECT_GE(second_public_key.size(), 32u);
+
+  EXPECT_NE(first_public_key, second_public_key);
+}
+
 class PushMessagingIncognitoBrowserTest : public PushMessagingBrowserTest {
  public:
   ~PushMessagingIncognitoBrowserTest() override {}
 
   // PushMessagingBrowserTest:
   void SetUpOnMainThread() override {
     incognito_browser_ = CreateIncognitoBrowser();
     PushMessagingBrowserTest::SetUpOnMainThread();
   }
 
@@ skipping 11 matching lines @@
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
   // In Incognito mode the promise returned by getSubscription should not hang,
   // it should just fulfill with null.
   ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
   ASSERT_EQ("false - not subscribed", script_result);
 }