summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_uitest.cc
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 18:07:51 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 18:07:51 +0000
commit075a7253bc09178cb94e44b4ae08f5ad1d00f07a (patch)
tree3102e07f44a1361d31d41ce15b28c0cb56efa290 /chrome/browser/browser_uitest.cc
parentd61653713c71eeff68b379e60a0e44545921994c (diff)
downloadchromium_src-075a7253bc09178cb94e44b4ae08f5ad1d00f07a.zip
chromium_src-075a7253bc09178cb94e44b4ae08f5ad1d00f07a.tar.gz
chromium_src-075a7253bc09178cb94e44b4ae08f5ad1d00f07a.tar.bz2
Create a ChromeProcessUtil for the Mac, and enable it in the tests.
Review URL: http://codereview.chromium.org/95009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_uitest.cc')
-rw-r--r--chrome/browser/browser_uitest.cc12
1 files changed, 0 insertions, 12 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index 99f9ccc..55ed855 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -117,18 +117,12 @@ TEST_F(BrowserTest, ThirtyFourTabs) {
return;
// See browser\renderer_host\render_process_host.cc for the algorithm to
// decide how many processes to create.
-#if defined(OS_WIN) || defined(OS_LINUX)
-// TODO(pinkerton): Turn this back on for Mac when ChromeBrowserProcessId()
-// gets implemented. Right now we don't have a good way to do it, and keeping
-// a file always open just so UI tests can check renderers seems a bit
-// wasteful.
int process_count = GetBrowserProcessCount();
if (base::SysInfo::AmountOfPhysicalMemoryMB() >= 2048) {
EXPECT_GE(process_count, 24);
} else {
EXPECT_LE(process_count, 23);
}
-#endif
}
#if defined(OS_WIN)
@@ -257,13 +251,7 @@ TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
int orig_tab_count = -1;
ASSERT_TRUE(window->GetTabCount(&orig_tab_count));
int orig_process_count = GetBrowserProcessCount();
-#if defined(OS_WIN) || defined(OS_LINUX)
-// TODO(pinkerton): Turn this back on for Mac when ChromeBrowserProcessId()
-// gets implemented. Right now we don't have a good way to do it, and keeping
-// a file always open just so UI tests can check renderers seems a bit
-// wasteful.
ASSERT_GE(orig_process_count, 1);
-#endif
// Use JavaScript URL to almost fork a new tab, but not quite. (Leave the
// opener non-null.) Should not fork a process.