Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Side by Side Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 1746483002: Revert of Pipe response_time from FetchManager to CacheStorage and ServiceWorkerURLRequestJob. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
17 #include "base/time/time.h"
18 #include "build/build_config.h" 17 #include "build/build_config.h"
19 #include "content/browser/fileapi/chrome_blob_storage_context.h" 18 #include "content/browser/fileapi/chrome_blob_storage_context.h"
20 #include "content/browser/service_worker/embedded_worker_instance.h" 19 #include "content/browser/service_worker/embedded_worker_instance.h"
21 #include "content/browser/service_worker/embedded_worker_registry.h" 20 #include "content/browser/service_worker/embedded_worker_registry.h"
22 #include "content/browser/service_worker/service_worker_context_core.h" 21 #include "content/browser/service_worker/service_worker_context_core.h"
23 #include "content/browser/service_worker/service_worker_context_observer.h" 22 #include "content/browser/service_worker/service_worker_context_observer.h"
24 #include "content/browser/service_worker/service_worker_context_wrapper.h" 23 #include "content/browser/service_worker/service_worker_context_wrapper.h"
25 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" 24 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
26 #include "content/browser/service_worker/service_worker_registration.h" 25 #include "content/browser/service_worker/service_worker_registration.h"
27 #include "content/browser/service_worker/service_worker_test_utils.h" 26 #include "content/browser/service_worker/service_worker_test_utils.h"
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 EXPECT_EQ(expected_headers, response.headers); 942 EXPECT_EQ(expected_headers, response.headers);
944 943
945 std::string body; 944 std::string body;
946 RunOnIOThread( 945 RunOnIOThread(
947 base::Bind(&ReadResponseBody, 946 base::Bind(&ReadResponseBody,
948 &body, base::Owned(blob_data_handle.release()))); 947 &body, base::Owned(blob_data_handle.release())));
949 EXPECT_EQ("This resource is gone. Gone, gone, gone.", body); 948 EXPECT_EQ("This resource is gone. Gone, gone, gone.", body);
950 } 949 }
951 950
952 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, 951 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
953 FetchEvent_ResponseTime) {
954 ServiceWorkerFetchEventResult result;
955 ServiceWorkerResponse response1;
956 ServiceWorkerResponse response2;
957 scoped_ptr<storage::BlobDataHandle> blob_data_handle;
958 const base::Time start_time(base::Time::Now());
959
960 RunOnIOThread(
961 base::Bind(&self::SetUpRegistrationOnIOThread, this,
962 "/service_worker/fetch_event_response_via_cache.js"));
963
964 FetchOnRegisteredWorker(&result, &response1, &blob_data_handle);
965 ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result);
966 EXPECT_EQ(200, response1.status_code);
967 EXPECT_EQ("OK", response1.status_text);
968 EXPECT_TRUE(response1.response_time >= start_time);
969
970 FetchOnRegisteredWorker(&result, &response2, &blob_data_handle);
971 ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result);
972 EXPECT_EQ(200, response2.status_code);
973 EXPECT_EQ("OK", response2.status_text);
974 EXPECT_EQ(response1.response_time, response2.response_time);
975 }
976
977 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
978 FetchEvent_respondWithRejection) { 952 FetchEvent_respondWithRejection) {
979 ServiceWorkerFetchEventResult result; 953 ServiceWorkerFetchEventResult result;
980 ServiceWorkerResponse response; 954 ServiceWorkerResponse response;
981 scoped_ptr<storage::BlobDataHandle> blob_data_handle; 955 scoped_ptr<storage::BlobDataHandle> blob_data_handle;
982 956
983 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this, 957 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this,
984 "/service_worker/fetch_event_rejected.js")); 958 "/service_worker/fetch_event_rejected.js"));
985 959
986 ConsoleListener console_listener; 960 ConsoleListener console_listener;
987 version_->embedded_worker()->AddListener(&console_listener); 961 version_->embedded_worker()->AddListener(&console_listener);
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1338 ASSERT_EQ(SERVICE_WORKER_OK, status); 1312 ASSERT_EQ(SERVICE_WORKER_OK, status);
1339 // Stop the worker. 1313 // Stop the worker.
1340 StopWorker(SERVICE_WORKER_OK); 1314 StopWorker(SERVICE_WORKER_OK);
1341 // Restart the worker. 1315 // Restart the worker.
1342 StartWorker(SERVICE_WORKER_OK); 1316 StartWorker(SERVICE_WORKER_OK);
1343 // Stop the worker. 1317 // Stop the worker.
1344 StopWorker(SERVICE_WORKER_OK); 1318 StopWorker(SERVICE_WORKER_OK);
1345 } 1319 }
1346 1320
1347 } // namespace content 1321 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698