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

Side by Side Diff: chrome/worker/worker_uitest.cc

Issue 6042009: Added WARN_UNUSED_RESULT to ScopedTempDir methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with trunk Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui_test_utils.cc ('k') | webkit/fileapi/file_system_operation_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string_util.h" 6 #include "base/string_util.h"
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/worker_host/worker_service.h" 10 #include "chrome/browser/worker_host/worker_service.h"
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 websocket_test_dir = websocket_test_dir.AppendASCII("tests"); 461 websocket_test_dir = websocket_test_dir.AppendASCII("tests");
462 462
463 FilePath worker_test_dir; 463 FilePath worker_test_dir;
464 worker_test_dir = worker_test_dir.AppendASCII("websocket"); 464 worker_test_dir = worker_test_dir.AppendASCII("websocket");
465 worker_test_dir = worker_test_dir.AppendASCII("tests"); 465 worker_test_dir = worker_test_dir.AppendASCII("tests");
466 worker_test_dir = worker_test_dir.AppendASCII("workers"); 466 worker_test_dir = worker_test_dir.AppendASCII("workers");
467 InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kHttpPort); 467 InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kHttpPort);
468 468
469 FilePath websocket_root_dir(temp_test_dir_); 469 FilePath websocket_root_dir(temp_test_dir_);
470 websocket_root_dir = websocket_root_dir.AppendASCII("LayoutTests"); 470 websocket_root_dir = websocket_root_dir.AppendASCII("LayoutTests");
471 ui_test_utils::TestWebSocketServer websocket_server(websocket_root_dir); 471 ui_test_utils::TestWebSocketServer websocket_server;
472 ASSERT_TRUE(websocket_server.Start(websocket_root_dir));
472 473
473 StartHttpServer(new_http_root_dir_); 474 StartHttpServer(new_http_root_dir_);
474 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) 475 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
475 RunLayoutTest(kLayoutTestFiles[i], kHttpPort); 476 RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
476 StopHttpServer(); 477 StopHttpServer();
477 } 478 }
478 479
479 TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) { 480 TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
480 static const char* kLayoutTestFiles[] = { 481 static const char* kLayoutTestFiles[] = {
481 "abort-exception-assert.html", 482 "abort-exception-assert.html",
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 RunWorkerFileSystemLayoutTest("simple-persistent-sync.html"); 710 RunWorkerFileSystemLayoutTest("simple-persistent-sync.html");
710 } 711 }
711 712
712 TEST_F(WorkerTest, DISABLED_WorkerFileSystemAsyncOperationsTest) { 713 TEST_F(WorkerTest, DISABLED_WorkerFileSystemAsyncOperationsTest) {
713 RunWorkerFileSystemLayoutTest("async-operations.html"); 714 RunWorkerFileSystemLayoutTest("async-operations.html");
714 } 715 }
715 716
716 TEST_F(WorkerTest, DISABLED_WorkerFileSystemSyncOperationsTest) { 717 TEST_F(WorkerTest, DISABLED_WorkerFileSystemSyncOperationsTest) {
717 RunWorkerFileSystemLayoutTest("sync-operations.html"); 718 RunWorkerFileSystemLayoutTest("sync-operations.html");
718 } 719 }
OLDNEW
« no previous file with comments | « chrome/test/ui_test_utils.cc ('k') | webkit/fileapi/file_system_operation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698