| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/platform_thread.h" | 8 #include "base/platform_thread.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "chrome/browser/worker_host/worker_service.h" | 10 #include "chrome/browser/worker_host/worker_service.h" |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 fast_test_dir = fast_test_dir.AppendASCII("fast"); | 301 fast_test_dir = fast_test_dir.AppendASCII("fast"); |
| 302 | 302 |
| 303 FilePath worker_test_dir; | 303 FilePath worker_test_dir; |
| 304 worker_test_dir = worker_test_dir.AppendASCII("workers"); | 304 worker_test_dir = worker_test_dir.AppendASCII("workers"); |
| 305 InitializeForLayoutTest(fast_test_dir, worker_test_dir, false); | 305 InitializeForLayoutTest(fast_test_dir, worker_test_dir, false); |
| 306 | 306 |
| 307 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) | 307 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) |
| 308 RunLayoutTest(kLayoutTestFiles[i], false); | 308 RunLayoutTest(kLayoutTestFiles[i], false); |
| 309 } | 309 } |
| 310 | 310 |
| 311 TEST_F(WorkerTest, WorkerHttpLayoutTests) { | 311 TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) { |
| 312 static const char* kLayoutTestFiles[] = { | 312 static const char* kLayoutTestFiles[] = { |
| 313 "text-encoding.html", | 313 "text-encoding.html", |
| 314 "worker-importScripts.html", | 314 "worker-importScripts.html", |
| 315 "worker-redirect.html", | 315 "worker-redirect.html", |
| 316 }; | 316 }; |
| 317 | 317 |
| 318 FilePath http_test_dir; | 318 FilePath http_test_dir; |
| 319 http_test_dir = http_test_dir.AppendASCII("LayoutTests"); | 319 http_test_dir = http_test_dir.AppendASCII("LayoutTests"); |
| 320 http_test_dir = http_test_dir.AppendASCII("http"); | 320 http_test_dir = http_test_dir.AppendASCII("http"); |
| 321 http_test_dir = http_test_dir.AppendASCII("tests"); | 321 http_test_dir = http_test_dir.AppendASCII("tests"); |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), | 387 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), |
| 388 UITest::GetBrowserProcessCount()); | 388 UITest::GetBrowserProcessCount()); |
| 389 | 389 |
| 390 // Now close the first tab and check that the queued workers were started. | 390 // Now close the first tab and check that the queued workers were started. |
| 391 tab->Close(true); | 391 tab->Close(true); |
| 392 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); | 392 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); |
| 393 | 393 |
| 394 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), | 394 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), |
| 395 UITest::GetBrowserProcessCount()); | 395 UITest::GetBrowserProcessCount()); |
| 396 } | 396 } |
| OLD | NEW |