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

Side by Side Diff: chrome/browser/extensions/content_script_apitest.cc

Issue 9885001: Mark flaky test as flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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) 2012 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/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/common/chrome_notification_types.h" 9 #include "chrome/common/chrome_notification_types.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 ui_test_utils::GetCurrentTabTitle(browser(), &title); 73 ui_test_utils::GetCurrentTabTitle(browser(), &title);
74 EXPECT_EQ(std::string("PASS"), UTF16ToUTF8(title)); 74 EXPECT_EQ(std::string("PASS"), UTF16ToUTF8(title));
75 } 75 }
76 76
77 // crbug.com/39249 -- content scripts js should not run on view source. 77 // crbug.com/39249 -- content scripts js should not run on view source.
78 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptViewSource) { 78 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptViewSource) {
79 ASSERT_TRUE(StartTestServer()); 79 ASSERT_TRUE(StartTestServer());
80 ASSERT_TRUE(RunExtensionTest("content_scripts/view_source")) << message_; 80 ASSERT_TRUE(RunExtensionTest("content_scripts/view_source")) << message_;
81 } 81 }
82 82
83 #if defined (OS_CHROMEOS)
84 IN_PROC_BROWSER_TEST_F(
85 ExtensionApiTest,
86 FLAKY_ContentScriptStylesInjectedIntoExistingRenderers) {
87 #else
83 IN_PROC_BROWSER_TEST_F( 88 IN_PROC_BROWSER_TEST_F(
84 ExtensionApiTest, ContentScriptStylesInjectedIntoExistingRenderers) { 89 ExtensionApiTest, ContentScriptStylesInjectedIntoExistingRenderers) {
90 #endif
85 ASSERT_TRUE(StartTestServer()); 91 ASSERT_TRUE(StartTestServer());
86 92
87 ui_test_utils::WindowedNotificationObserver signal( 93 ui_test_utils::WindowedNotificationObserver signal(
88 chrome::NOTIFICATION_USER_SCRIPTS_UPDATED, 94 chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
89 content::Source<Profile>(browser()->profile())); 95 content::Source<Profile>(browser()->profile()));
90 96
91 // Start with a renderer already open at a URL. 97 // Start with a renderer already open at a URL.
92 GURL url(test_server()->GetURL("file/extensions/test_file.html")); 98 GURL url(test_server()->GetURL("file/extensions/test_file.html"));
93 ui_test_utils::NavigateToURL(browser(), url); 99 ui_test_utils::NavigateToURL(browser(), url);
94 100
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 ui_test_utils::NavigateToURL( 137 ui_test_utils::NavigateToURL(
132 browser(), test_server()->GetURL("events.html")); 138 browser(), test_server()->GetURL("events.html"));
133 139
134 // Navigate to an extension page that will fire the event events.js is 140 // Navigate to an extension page that will fire the event events.js is
135 // listening for. 141 // listening for.
136 ui_test_utils::NavigateToURLWithDisposition( 142 ui_test_utils::NavigateToURLWithDisposition(
137 browser(), extension->GetResourceURL("fire_event.html"), 143 browser(), extension->GetResourceURL("fire_event.html"),
138 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE); 144 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
139 EXPECT_TRUE(catcher.GetNextResult()); 145 EXPECT_TRUE(catcher.GetNextResult());
140 } 146 }
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