summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 20:54:36 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 20:54:36 +0000
commit2340a3c1f6c0f05569f9e062e048e19884eb19ef (patch)
tree8922b29fe439d9b2ab1bf8b56ecadc532db1d032
parent4c5813a2cdc5b998bfcbb5cf9ca4a4e982893706 (diff)
downloadchromium_src-2340a3c1f6c0f05569f9e062e048e19884eb19ef.zip
chromium_src-2340a3c1f6c0f05569f9e062e048e19884eb19ef.tar.gz
chromium_src-2340a3c1f6c0f05569f9e062e048e19884eb19ef.tar.bz2
Disabled AppApiTest.AppProcess on Mac and Linux
The test is flaky on Mac and Linux (was already disabled on Windows). BUG=172750 TBR=tim@chromium.org Review URL: https://codereview.chromium.org/17140006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206794 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/app_process_apitest.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 23a6548..f47eb7b 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -137,12 +137,7 @@ class BlockedAppApiTest : public AppApiTest {
// Tests that hosted apps with the background permission get a process-per-app
// model, since all pages need to be able to script the background page.
// http://crbug.com/172750
-#if defined(OS_WIN)
-#define MAYBE_AppProcess DISABLED_AppProcess
-#else
-#define MAYBE_AppProcess AppProcess
-#endif
-IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcess) {
+IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_AppProcess) {
LOG(INFO) << "Start of test.";
extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(