ServiceWorker: support Response.{status,statusText,headers} [chromium] (1/3)

content/browser/service_worker/service_worker_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 "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
@@ skipping 445 matching lines @@
   ActivateTestHelper("/service_worker/worker_activate_rejected.js",
                      SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
                        InstallWithWaitUntil_Rejected) {
   InstallTestHelper("/service_worker/worker_install_rejected.js",
                     SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED);
 }
 
-IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchEvent_Response) {
+// TODO(kinuko): Re-enable thist test once blink-side patch is rolled for

[jsbell, 2014/05/23 21:05:06]

typo: 'thist'

[kinuko, 2014/05/26 02:35:48]

Done.

+// http://crbug.com/376733
+IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
+                       DISABLED_FetchEvent_Response) {
   ServiceWorkerFetchEventResult result;
   ServiceWorkerResponse response;
   FetchTestHelper("/service_worker/fetch_event.js", &result, &response);
   ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result);
-  EXPECT_EQ(200, response.status_code);
-  EXPECT_EQ("OK", response.status_text);
-  EXPECT_EQ("GET", response.method);
+  EXPECT_EQ(301, response.status_code);
+  EXPECT_EQ("Moved Permently", response.status_text);

[falken, 2014/05/24 14:49:51]

typo "Permently"

[kinuko, 2014/05/26 02:35:48]

Oops... done.

   std::map<std::string, std::string> expected_headers;
+  expected_headers["Content-Language"] = "fi";
+  expected_headers["Content-Type"] = "text/html; charset=UTF-8";
   EXPECT_EQ(expected_headers, response.headers);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
                        FetchEvent_FallbackToNative) {
   ServiceWorkerFetchEventResult result;
   ServiceWorkerResponse response;
   FetchTestHelper(
       "/service_worker/fetch_event_fallback.js", &result, &response);
   ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK, result);
@@ skipping 17 matching lines @@
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(&self::SyncEventOnIOThread,
                                      this,
                                      sync_run_loop.QuitClosure(),
                                      &status));
   sync_run_loop.Run();
   ASSERT_EQ(SERVICE_WORKER_ERROR_ABORT, status);
 }
 
-IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, SyncEventHandled) {
+// TODO(kinuko): Re-enable thist test once blink-side patch is rolled for

[jsbell, 2014/05/23 21:05:06]

typo: 'thist'

[kinuko, 2014/05/26 02:35:48]

Done.

+// http://crbug.com/376733
+IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
+                       DISABLED_SyncEventHandled) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kEnableServiceWorkerSync);
 
   RunOnIOThread(base::Bind(
       &self::SetUpRegistrationOnIOThread, this, "/service_worker/sync.js"));
   ServiceWorkerFetchEventResult result;
   ServiceWorkerResponse response;
 
   // Should 404 before sync event.
   FetchOnRegisteredWorker(&result, &response);
@@ skipping 122 matching lines @@
         base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO,
                    this,
                    embedded_test_server()->GetURL("/service_worker/empty.html"),
                    &status,
                    &script_url));
     EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status);
   }
 }
 
 }  // namespace content