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

Side by Side Diff: chrome/test/ui/npapi_uitest.cc

Issue 7840011: Disable the DeletePluginInDeallocate test on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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) 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <comutil.h> 8 #include <comutil.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) { 153 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) {
154 show_window_ = true; 154 show_window_ = true;
155 const FilePath test_case(FILE_PATH_LITERAL("self_delete_plugin_stream.html")); 155 const FilePath test_case(FILE_PATH_LITERAL("self_delete_plugin_stream.html"));
156 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); 156 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
157 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); 157 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
158 WaitForFinish("self_delete_plugin_stream", "1", url, 158 WaitForFinish("self_delete_plugin_stream", "1", url,
159 kTestCompleteCookie, kTestCompleteSuccess, 159 kTestCompleteCookie, kTestCompleteSuccess,
160 TestTimeouts::action_max_timeout_ms()); 160 TestTimeouts::action_max_timeout_ms());
161 } 161 }
162 162
163 TEST_F(NPAPIVisiblePluginTester, DeletePluginInDeallocate) { 163 // http://crbug.com/95558
164 // This test fails frequently on Mac, so it is disabled for now.
165 #if defined(OS_MACOSX)
166 #define MAYBE_DeletePluginInDeallocate DISABLED_DeletePluginInDeallocate
167 #else
168 #define MAYBE_DeletePluginInDeallocate DeletePluginInDeallocate
169 #endif
170 TEST_F(NPAPIVisiblePluginTester, MAYBE_DeletePluginInDeallocate) {
164 show_window_ = true; 171 show_window_ = true;
165 const FilePath test_case( 172 const FilePath test_case(
166 FILE_PATH_LITERAL("plugin_delete_in_deallocate.html")); 173 FILE_PATH_LITERAL("plugin_delete_in_deallocate.html"));
167 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); 174 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
168 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); 175 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
169 WaitForFinish("delete_plugin_in_deallocate_test", "signaller", url, 176 WaitForFinish("delete_plugin_in_deallocate_test", "signaller", url,
170 kTestCompleteCookie, kTestCompleteSuccess, 177 kTestCompleteCookie, kTestCompleteSuccess,
171 TestTimeouts::action_max_timeout_ms()); 178 TestTimeouts::action_max_timeout_ms());
172 } 179 }
173 180
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 ASSERT_TRUE(tab->LoadBlockedPlugins()); 444 ASSERT_TRUE(tab->LoadBlockedPlugins());
438 445
439 WaitForFinish("setup", "1", url, kTestCompleteCookie, 446 WaitForFinish("setup", "1", url, kTestCompleteCookie,
440 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); 447 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms());
441 448
442 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()")); 449 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()"));
443 450
444 WaitForFinish("setup", "2", url, kTestCompleteCookie, 451 WaitForFinish("setup", "2", url, kTestCompleteCookie,
445 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); 452 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms());
446 } 453 }
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