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

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

Issue 159322: Reenable running worker UI tests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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 | « no previous file | no next file » | 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) 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"
11 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
12 #include "chrome/test/automation/browser_proxy.h" 12 #include "chrome/test/automation/browser_proxy.h"
13 #include "chrome/test/automation/tab_proxy.h" 13 #include "chrome/test/automation/tab_proxy.h"
14 #include "chrome/test/ui/ui_test.h" 14 #include "chrome/test/ui/ui_test.h"
15 #include "net/base/escape.h" 15 #include "net/base/escape.h"
16 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
17 17
18 // TODO(levin): The debug bots were not happy. See http://crbug.com/17572.
19 #ifndef NDEBUG
20 #define SingleWorker DISABLED_SingleWorker
21 #define MultipleWorkers DISABLED_MultipleWorkers
22 #define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
23 #define WorkerHttpLayoutTests DISABLED_WorkerHttpLayoutTests
24 #define WorkerXhrHttpLayoutTests DISABLED_WorkerXhrHttpLayoutTests
25 #define LimitPerPage DISABLED_LimitPerPage
26 #define LimitTotal DISABLED_LimitTotal
27 #endif
28
29 #if defined(OS_WIN) 18 #if defined(OS_WIN)
30 const char kPlatformName[] = "chromium-win"; 19 const char kPlatformName[] = "chromium-win";
31 #elif defined(OS_MACOSX) 20 #elif defined(OS_MACOSX)
32 const char kPlatformName[] = "chromium-mac"; 21 const char kPlatformName[] = "chromium-mac";
33 #elif defined(OS_LINUX) 22 #elif defined(OS_LINUX)
34 const char kPlatformName[] = "chromium-linux"; 23 const char kPlatformName[] = "chromium-linux";
35 #else 24 #else
36 #error No known OS defined 25 #error No known OS defined
37 #endif 26 #endif
38 27
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), 386 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
398 UITest::GetBrowserProcessCount()); 387 UITest::GetBrowserProcessCount());
399 388
400 // Now close the first tab and check that the queued workers were started. 389 // Now close the first tab and check that the queued workers were started.
401 tab->Close(true); 390 tab->Close(true);
402 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); 391 tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
403 392
404 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), 393 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
405 UITest::GetBrowserProcessCount()); 394 UITest::GetBrowserProcessCount());
406 } 395 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698