BackgroundSync sync events need to be ExtendableEvents, content browser tests

content/browser/service_worker/service_worker_browsertest.cc

Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index f8a9a73d02c93f8c513650df070b85d7b742dd25..68a2dbc578051345121db723a3f90872a17c676f 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -541,6 +541,39 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
     ASSERT_EQ(expected_status, status);
   }
 
+  base::string16 RunSyncTestWithConsoleOutput(
+      const std::string& worker_url,
+      ServiceWorkerStatusCode expected_status) {
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    command_line->AppendSwitch(switches::kEnableServiceWorkerSync);
+    RunOnIOThread(
+        base::Bind(&self::SetUpRegistrationOnIOThread, this, worker_url));
+    return SyncOnRegisteredWorkerWithConsoleOutput(expected_status);
+  }
+
+  void SyncOnRegisteredWorker(ServiceWorkerStatusCode expected_status) {
+    ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
+    base::RunLoop sync_run_loop;
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                            base::Bind(&self::SyncEventOnIOThread, this,
+                                       sync_run_loop.QuitClosure(), &status));
+    sync_run_loop.Run();
+    ASSERT_EQ(expected_status, status);
+  }
+
+  base::string16 SyncOnRegisteredWorkerWithConsoleOutput(
+      ServiceWorkerStatusCode expected_status) {
+    ConsoleListener console_listener;
+    version_->embedded_worker()->AddListener(&console_listener);
+
+    SyncOnRegisteredWorker(expected_status);
+
+    console_listener.WaitForConsoleMessages(1);
+    base::string16 console_output = console_listener.messages()[0];
+    version_->embedded_worker()->RemoveListener(&console_listener);
+    return console_output;
+  }
+
   void FetchOnRegisteredWorker(
       ServiceWorkerFetchEventResult* result,
       ServiceWorkerResponse* response,
@@ -1149,6 +1182,50 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, SyncEventHandled) {
   EXPECT_EQ(200, response.status_code);
 }
 
+IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, SyncEventInterface) {
+  // Verify that the fired sync event has the correct interface
+  // The js event handler will console.log the event properties

[jkarlin, 2015/06/12 13:11:18]

Missing periods after each sentence.

[chasej, 2015/06/12 16:04:12]

Done.

+  base::string16 console_output = RunSyncTestWithConsoleOutput(
+      "/background_sync/sync_event_interface.js", SERVICE_WORKER_OK);
+
+  EXPECT_FALSE(console_output.empty()) << "Console output should not be empty";

[jkarlin, 2015/06/12 13:11:18]

The string seems redundant here.

[chasej, 2015/06/12 16:04:12]

Done.

+
+  // Console output is a pipe-delimited string, as:
+  // <event prototype>|<typeof waitUntil>
+  std::vector<base::string16> event_properties;
+  base::SplitString(console_output, '|', &event_properties);
+
+  const base::string16::size_type num_properties = 2;
+  const base::string16 event_type = base::ASCIIToUTF16("SyncEvent");
+  const base::string16 wait_until_type = base::ASCIIToUTF16("function");
+  EXPECT_EQ(num_properties, event_properties.size());
+  EXPECT_EQ(event_type, event_properties[0]);
+  EXPECT_EQ(wait_until_type, event_properties[1]);
+}
+
+IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
+                       SyncEventWaitUntil_Fulfilled) {
+  base::string16 console_output = RunSyncTestWithConsoleOutput(
+      "/background_sync/sync_event_fulfilled.js", SERVICE_WORKER_OK);
+
+  // Verify that the event.waitUntil function resolved the promise.  If so,
+  // the js event handler will console.log the expected output

[jkarlin, 2015/06/12 13:11:18]

missing period at end of sentence

[chasej, 2015/06/12 16:04:12]

Done.

+  const base::string16 expected = base::ASCIIToUTF16("Fulfilling onsync event");
+  EXPECT_EQ(expected, console_output);
+}
+
+IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
+                       SyncEventWaitUntil_Rejected) {
+  base::string16 console_output = RunSyncTestWithConsoleOutput(
+      "/background_sync/sync_event_rejected.js",
+      SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED);
+
+  // Verify that the event.waitUntil function rejected the promise.  If so,
+  // the js event handler will console.log the expected output

[jkarlin, 2015/06/12 13:11:18]

ditto

[chasej, 2015/06/12 16:04:12]

Done.

+  const base::string16 expected = base::ASCIIToUTF16("Rejecting onsync event");
+  EXPECT_EQ(expected, console_output);
+}
+
 IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, Reload) {
   const char kPageUrl[] = "/service_worker/reload.html";
   const char kWorkerUrl[] = "/service_worker/fetch_event_reload.js";