Push API: Replace buggy FutureData test helper with ResultQueue

chrome/browser/services/gcm/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/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 331 matching lines @@
 
   ASSERT_TRUE(RunScript("isControlled()", &script_result));
   ASSERT_EQ("false - is not controlled", script_result);
 
   LoadTestPage();  // Reload to become controlled.
 
   ASSERT_TRUE(RunScript("isControlled()", &script_result));
   ASSERT_EQ("true - is controlled", script_result);
 
   GCMClient::IncomingMessage message;
-  GCMClient::MessageData messageData;
-  messageData.insert(std::pair<std::string, std::string>("data", "testdata"));
-  message.data = messageData;
+  message.data["data"] = "testdata";
   push_service()->OnMessage(app_id.ToString(), message);
-  ASSERT_TRUE(RunScript("pushData.get()", &script_result));
+  ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result));
   EXPECT_EQ("testdata", script_result);
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PushEventNoServiceWorker) {
   std::string script_result;
 
   TryToRegisterSuccessfully("1-0" /* expected_push_registration_id */);
 
   PushMessagingApplicationId app_id(https_server()->GetURL(""), 0LL);
   EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());
@@ skipping 11 matching lines @@
   ASSERT_TRUE(RunScript("unregisterServiceWorker()", &script_result));
   ASSERT_EQ("service worker unregistration status: true", script_result);
 
   // When the push service will receive it next message, given that there is no
   // SW available, it should unregister |app_id|.
   UnregistrationCallback callback;
   gcm_service()->SetUnregisterCallback(base::Bind(&UnregistrationCallback::Run,
                                                   base::Unretained(&callback)));
 
   GCMClient::IncomingMessage message;
-  GCMClient::MessageData messageData;
-  messageData.insert(std::pair<std::string, std::string>("data", "testdata"));
-  message.data = messageData;
+  message.data["data"] = "testdata";
   push_service()->OnMessage(app_id.ToString(), message);
 
   callback.WaitUntilSatisfied();
   EXPECT_EQ(app_id.ToString(), callback.app_id());
 
   // No push data should have been received.
-  ASSERT_TRUE(RunScript("pushData.getImmediately()", &script_result));
+  ASSERT_TRUE(RunScript("resultQueue.popImmediately()", &script_result));
   EXPECT_EQ("null", script_result);
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PushEventNoPermission) {
   std::string script_result;
 
   TryToRegisterSuccessfully("1-0" /* expected_push_registration_id */);
 
   PushMessagingApplicationId app_id(https_server()->GetURL(""), 0LL);
   EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());
@@ skipping 11 matching lines @@
   browser()->profile()->GetHostContentSettingsMap()->
       ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING);
 
   // When the push service will receive its next message, given that there is no
   // SW available, it should unregister |app_id|.
   UnregistrationCallback callback;
   gcm_service()->SetUnregisterCallback(base::Bind(&UnregistrationCallback::Run,
                                                   base::Unretained(&callback)));
 
   GCMClient::IncomingMessage message;
-  GCMClient::MessageData messageData;
-  messageData.insert(std::pair<std::string, std::string>("data", "testdata"));
-  message.data = messageData;
+  message.data["data"] = "testdata";
   push_service()->OnMessage(app_id.ToString(), message);
 
   callback.WaitUntilSatisfied();
   EXPECT_EQ(app_id.ToString(), callback.app_id());
 
   // No push data should have been received.
-  ASSERT_TRUE(RunScript("pushData.getImmediately()", &script_result));
+  ASSERT_TRUE(RunScript("resultQueue.popImmediately()", &script_result));
   EXPECT_EQ("null", script_result);
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysDefault) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
   ASSERT_TRUE(RunScript("hasPermission()", &script_result));
@@ skipping 66 matching lines @@
 
   gcm_service()->AddExpectedUnregisterResponse(GCMClient::UNKNOWN_ERROR);
 
   ASSERT_TRUE(RunScript("unregister()", &script_result));
   EXPECT_EQ("unregister error: "
             "UnknownError: Unexpected error while trying to unregister from the"
             " push server.", script_result);
 }
 
 }  // namespace gcm