diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 16:52:39 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 16:52:39 +0000 |
| commit | 3221d8de74a78d97694ba6ac8231084292664603 (patch) | |
| tree | 4a14ccef6d722f894de78499819bd3d278466edf /chrome/browser/extensions/app_process_apitest.cc | |
| parent | 89117c41f636a81032271661f939d81f9fb44a5f (diff) | |
| download | chromium_src-3221d8de74a78d97694ba6ac8231084292664603.zip chromium_src-3221d8de74a78d97694ba6ac8231084292664603.tar.gz chromium_src-3221d8de74a78d97694ba6ac8231084292664603.tar.bz2 | |
Disable AppApiTest.ReloadIntoAppProcess on Win and Mac
TBR=wez@chromium.org
BUG=238670
Review URL: https://codereview.chromium.org/15041002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_process_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 952bf21..574f83e 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -481,9 +481,18 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) { contents->GetRenderProcessHost()->GetID())); } +// Crashes on Windows and Mac. http://crbug.com/238670 +#if defined(OS_WIN) || defined(OS_MACOSX) +#define MAYBE_ReloadIntoAppProcessWithJavaScript \ + DISABLED_ReloadIntoAppProcessWithJavaScript +#else +#define MAYBE_ReloadIntoAppProcessWithJavaScript \ + ReloadIntoAppProcessWithJavaScript +#endif + // Ensure that reloading a URL with JavaScript after installing or uninstalling // it as an app correctly swaps the process. (http://crbug.com/80621) -IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcessWithJavaScript) { +IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcessWithJavaScript) { extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get( browser()->profile())->extension_service()->process_map(); |