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

Side by Side Diff: content/browser/shared_worker/worker_browsertest.cc

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/sys_info.h" 11 #include "base/sys_info.h"
12 #include "base/test/test_timeouts.h" 12 #include "base/test/test_timeouts.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/client_certificate_delegate.h" 15 #include "content/public/browser/client_certificate_delegate.h"
16 #include "content/public/common/content_paths.h" 16 #include "content/public/common/content_paths.h"
17 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
18 #include "content/public/test/content_browser_test.h" 18 #include "content/public/test/content_browser_test.h"
19 #include "content/public/test/content_browser_test_utils.h" 19 #include "content/public/test/content_browser_test_utils.h"
20 #include "content/public/test/test_utils.h" 20 #include "content/public/test/test_utils.h"
21 #include "content/shell/browser/shell.h" 21 #include "content/shell/browser/shell.h"
22 #include "content/shell/browser/shell_content_browser_client.h" 22 #include "content/shell/browser/shell_content_browser_client.h"
23 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" 23 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
24 #include "net/base/escape.h" 24 #include "net/base/escape.h"
25 #include "net/base/test_data_directory.h"
26 #include "net/ssl/ssl_server_config.h" 25 #include "net/ssl/ssl_server_config.h"
27 #include "net/test/embedded_test_server/embedded_test_server.h" 26 #include "net/test/embedded_test_server/embedded_test_server.h"
28 #include "net/test/spawned_test_server/spawned_test_server.h" 27 #include "net/test/spawned_test_server/spawned_test_server.h"
28 #include "net/test/test_data_directory.h"
29 #include "url/gurl.h" 29 #include "url/gurl.h"
30 30
31 namespace content { 31 namespace content {
32 32
33 namespace { 33 namespace {
34 34
35 bool SupportsSharedWorker() { 35 bool SupportsSharedWorker() {
36 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
37 // SharedWorkers are not enabled on Android. https://crbug.com/154571 37 // SharedWorkers are not enabled on Android. https://crbug.com/154571
38 // 38 //
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 238
239 IN_PROC_BROWSER_TEST_F(WorkerTest, 239 IN_PROC_BROWSER_TEST_F(WorkerTest,
240 PassMessagePortToSharedWorkerDontWaitForConnect) { 240 PassMessagePortToSharedWorkerDontWaitForConnect) {
241 if (!SupportsSharedWorker()) 241 if (!SupportsSharedWorker())
242 return; 242 return;
243 243
244 RunTest("pass_messageport_to_sharedworker_dont_wait_for_connect.html", ""); 244 RunTest("pass_messageport_to_sharedworker_dont_wait_for_connect.html", "");
245 } 245 }
246 246
247 } // namespace content 247 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698