[Push] Use proper accessors for PushMessagingApplicationId.

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 250 matching lines @@
       browser()->profile(), origin, service_worker_registration_id);
   EXPECT_TRUE(application_id.IsValid());
   return application_id;
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
                        RegisterSuccessNotificationsGranted) {
   TryToRegisterSuccessfully("1-0" /* expected_push_registration_id */);
 
   PushMessagingApplicationId app_id = GetServiceWorkerAppId(0LL);
-  EXPECT_EQ(app_id.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id.app_id_guid(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
                        RegisterSuccessNotificationsPrompt) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
   InfoBarResponder accepting_responder(browser(), true);
   ASSERT_TRUE(RunScript("registerPush()", &script_result));
   EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result);
 
   PushMessagingApplicationId app_id = GetServiceWorkerAppId(0LL);
-  EXPECT_EQ(app_id.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id.app_id_guid(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
                        RegisterFailureNotificationsBlocked) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
@@ skipping 29 matching lines @@
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterPersisted) {
   std::string script_result;
 
   // First, test that Service Worker registration IDs are assigned in order of
   // registering the Service Workers, and the (fake) push registration ids are
   // assigned in order of push registration (even when these orders are
   // different).
 
   TryToRegisterSuccessfully("1-0" /* expected_push_registration_id */);
   PushMessagingApplicationId app_id_sw0 = GetServiceWorkerAppId(0LL);
-  EXPECT_EQ(app_id_sw0.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id_sw0.app_id_guid(), gcm_service()->last_registered_app_id());
 
   LoadTestPage("files/push_messaging/subscope1/test.html");
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
   LoadTestPage("files/push_messaging/subscope2/test.html");
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
   // Note that we need to reload the page after registering, otherwise
   // navigator.serviceWorker.ready is going to be resolved with the parent
   // Service Worker which still controls the page.
   LoadTestPage("files/push_messaging/subscope2/test.html");
   TryToRegisterSuccessfully("1-1" /* expected_push_registration_id */);
   PushMessagingApplicationId app_id_sw2 = GetServiceWorkerAppId(2LL);
-  EXPECT_EQ(app_id_sw2.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id_sw2.app_id_guid(), gcm_service()->last_registered_app_id());
 
   LoadTestPage("files/push_messaging/subscope1/test.html");
   TryToRegisterSuccessfully("1-2" /* expected_push_registration_id */);
   PushMessagingApplicationId app_id_sw1 = GetServiceWorkerAppId(1LL);
-  EXPECT_EQ(app_id_sw1.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id_sw1.app_id_guid(), gcm_service()->last_registered_app_id());
 
   // Now test that the Service Worker registration IDs and push registration IDs
   // generated above were persisted to SW storage, by checking that they are
   // unchanged despite requesting them in a different order.
   // TODO(johnme): Ideally we would restart the browser at this point to check
   // they were persisted to disk, but that's not currently possible since the
   // test server uses random port numbers for each test (even PRE_Foo and Foo),
   // so we wouldn't be able to load the test pages with the same origin.
 
   LoadTestPage("files/push_messaging/subscope1/test.html");
   TryToRegisterSuccessfully("1-2" /* expected_push_registration_id */);
-  EXPECT_EQ(app_id_sw1.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id_sw1.app_id_guid(), gcm_service()->last_registered_app_id());
 
   LoadTestPage("files/push_messaging/subscope2/test.html");
   TryToRegisterSuccessfully("1-1" /* expected_push_registration_id */);
-  EXPECT_EQ(app_id_sw1.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id_sw1.app_id_guid(), gcm_service()->last_registered_app_id());
 
   LoadTestPage();
   TryToRegisterSuccessfully("1-0" /* expected_push_registration_id */);
-  EXPECT_EQ(app_id_sw1.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id_sw1.app_id_guid(), gcm_service()->last_registered_app_id());
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PushEventSuccess) {
   std::string script_result;
 
   TryToRegisterSuccessfully("1-0" /* expected_push_registration_id */);
 
   PushMessagingApplicationId app_id = GetServiceWorkerAppId(0LL);
-  EXPECT_EQ(app_id.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id.app_id_guid(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 
   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;
   message.data["data"] = "testdata";
-  push_service()->OnMessage(app_id.app_id_guid, message);
+  push_service()->OnMessage(app_id.app_id_guid(), message);
   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 = GetServiceWorkerAppId(0LL);
-  EXPECT_EQ(app_id.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id.app_id_guid(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 
   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);
 
   // Unregister service worker. Sending a message should now fail.
   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;
   message.data["data"] = "testdata";
-  push_service()->OnMessage(app_id.app_id_guid, message);
+  push_service()->OnMessage(app_id.app_id_guid(), message);
 
   callback.WaitUntilSatisfied();
-  EXPECT_EQ(app_id.app_id_guid, callback.app_id());
+  EXPECT_EQ(app_id.app_id_guid(), callback.app_id());
 
   // No push data should have been received.
   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 = GetServiceWorkerAppId(0LL);
-  EXPECT_EQ(app_id.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id.app_id_guid(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 
   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);
 
   // Revoke Push permission.
   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;
   message.data["data"] = "testdata";
-  push_service()->OnMessage(app_id.app_id_guid, message);
+  push_service()->OnMessage(app_id.app_id_guid(), message);
 
   callback.WaitUntilSatisfied();
-  EXPECT_EQ(app_id.app_id_guid, callback.app_id());
+  EXPECT_EQ(app_id.app_id_guid(), callback.app_id());
 
   // No push data should have been received.
   ASSERT_TRUE(RunScript("resultQueue.popImmediately()", &script_result));
   EXPECT_EQ("null", script_result);
 }
 
 #if defined(ENABLE_NOTIFICATIONS)
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
                        PushEventEnforcesUserVisibleNotification) {
   std::string script_result;
 
   TryToRegisterSuccessfully("1-0" /* expected_push_registration_id */);
 
   PushMessagingApplicationId app_id = GetServiceWorkerAppId(0LL);
-  EXPECT_EQ(app_id.app_id_guid, gcm_service()->last_registered_app_id());
+  EXPECT_EQ(app_id.app_id_guid(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 
   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);
 
   notification_manager()->CancelAll();
   ASSERT_EQ(0u, notification_manager()->GetNotificationCount());
 
   // We'll need to specify the web_contents in which to eval script, since we're
   // going to run script in a background tab.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // If the site is visible in an active tab, we should not force a notification
   // to be shown. Try it twice, since we allow one mistake per 10 push events.
   GCMClient::IncomingMessage message;
   for (int n = 0; n < 2; n++) {
     message.data["data"] = "testdata";
-    push_service()->OnMessage(app_id.app_id_guid, message);
+    push_service()->OnMessage(app_id.app_id_guid(), message);
     ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result));
     EXPECT_EQ("testdata", script_result);
     EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
   }
 
   // Open a blank foreground tab so site is no longer visible.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL("about:blank"), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   // If the Service Worker push event handler does not show a notification, we
   // should show a forced one, but only on the 2nd occurrence since we allow one
   // mistake per 10 push events.
   message.data["data"] = "testdata";
-  push_service()->OnMessage(app_id.app_id_guid, message);
+  push_service()->OnMessage(app_id.app_id_guid(), message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("testdata", script_result);
   EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
   message.data["data"] = "testdata";
-  push_service()->OnMessage(app_id.app_id_guid, message);
+  push_service()->OnMessage(app_id.app_id_guid(), message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("testdata", script_result);
   EXPECT_EQ(1u, notification_manager()->GetNotificationCount());
   EXPECT_EQ(base::ASCIIToUTF16(kPushMessagingForcedNotificationTag),
             notification_manager()->GetNotificationAt(0).replace_id());
 
   // Currently, this notification will stick around until the user or webapp
   // explicitly dismisses it (though we may change this later).
   message.data["data"] = "shownotification";
-  push_service()->OnMessage(app_id.app_id_guid, message);
+  push_service()->OnMessage(app_id.app_id_guid(), message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("shownotification", script_result);
   EXPECT_EQ(2u, notification_manager()->GetNotificationCount());
 
   notification_manager()->CancelAll();
   EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
 
   // However if the Service Worker push event handler shows a notification, we
   // should not show a forced one.
   message.data["data"] = "shownotification";
   for (int n = 0; n < 9; n++) {
-    push_service()->OnMessage(app_id.app_id_guid, message);
+    push_service()->OnMessage(app_id.app_id_guid(), message);
     ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
     EXPECT_EQ("shownotification", script_result);
     EXPECT_EQ(1u, notification_manager()->GetNotificationCount());
     EXPECT_EQ(base::ASCIIToUTF16("push_test_tag"),
               notification_manager()->GetNotificationAt(0).replace_id());
     notification_manager()->CancelAll();
   }
 
   // Now that 10 push messages in a row have shown notifications, we should
   // allow the next one to mistakenly not show a notification.
   message.data["data"] = "testdata";
-  push_service()->OnMessage(app_id.app_id_guid, message);
+  push_service()->OnMessage(app_id.app_id_guid(), message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("testdata", script_result);
   EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysDefault) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
@@ skipping 69 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