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

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

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 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 "chrome/browser/extensions/extension_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.h"
6 #include "chrome/browser/ui/browser.h" 6 #include "chrome/browser/ui/browser.h"
7 #include "chrome/browser/ui/tabs/tab_strip_model.h" 7 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/common/extensions/extension.h" 8 #include "chrome/common/extensions/extension.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 ASSERT_TRUE(extension); 156 ASSERT_TRUE(extension);
157 std::string id = extension->id(); 157 std::string id = extension->id();
158 158
159 NavigateToFeedAndValidate(test_server(), kValidFeed1, browser(), id, true, 159 NavigateToFeedAndValidate(test_server(), kValidFeed1, browser(), id, true,
160 "Feed for MyFeedTitle", 160 "Feed for MyFeedTitle",
161 "Title 1", 161 "Title 1",
162 "Desc", 162 "Desc",
163 "No error"); 163 "No error");
164 } 164 }
165 165
166 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed2) { 166 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
167 // TODO(erg): linux_aura bringup: http://crbug.com/163931
168 #define MAYBE_ParseFeedValidFeed2 DISABLED_ParseFeedValidFeed2
169 #else
170 #define MAYBE_ParseFeedValidFeed2 ParseFeedValidFeed2
171 #endif
172
173 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_ParseFeedValidFeed2) {
167 ASSERT_TRUE(test_server()->Start()); 174 ASSERT_TRUE(test_server()->Start());
168 175
169 const Extension* extension = LoadExtension( 176 const Extension* extension = LoadExtension(
170 test_data_dir_.AppendASCII("subscribe_page_action")); 177 test_data_dir_.AppendASCII("subscribe_page_action"));
171 ASSERT_TRUE(extension); 178 ASSERT_TRUE(extension);
172 std::string id = extension->id(); 179 std::string id = extension->id();
173 180
174 NavigateToFeedAndValidate(test_server(), kValidFeed2, browser(), id, true, 181 NavigateToFeedAndValidate(test_server(), kValidFeed2, browser(), id, true,
175 "Feed for MyFeed2", 182 "Feed for MyFeed2",
176 "My item title1", 183 "My item title1",
(...skipping 24 matching lines...) Expand all
201 ASSERT_TRUE(extension); 208 ASSERT_TRUE(extension);
202 std::string id = extension->id(); 209 std::string id = extension->id();
203 210
204 NavigateToFeedAndValidate(test_server(), kValidFeed4, browser(), id, true, 211 NavigateToFeedAndValidate(test_server(), kValidFeed4, browser(), id, true,
205 "Feed for Title chars <script> %23 stop", 212 "Feed for Title chars <script> %23 stop",
206 "Title chars %23 stop", 213 "Title chars %23 stop",
207 "My dear content %23 stop", 214 "My dear content %23 stop",
208 "No error"); 215 "No error");
209 } 216 }
210 217
211 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed0) { 218 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
219 // TODO(erg): linux_aura bringup: http://crbug.com/163931
220 #define MAYBE_ParseFeedValidFeed0 DISABLED_ParseFeedValidFeed0
221 #else
222 #define MAYBE_ParseFeedValidFeed0 ParseFeedValidFeed0
223 #endif
224
225 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_ParseFeedValidFeed0) {
212 ASSERT_TRUE(test_server()->Start()); 226 ASSERT_TRUE(test_server()->Start());
213 227
214 const Extension* extension = LoadExtension( 228 const Extension* extension = LoadExtension(
215 test_data_dir_.AppendASCII("subscribe_page_action")); 229 test_data_dir_.AppendASCII("subscribe_page_action"));
216 ASSERT_TRUE(extension); 230 ASSERT_TRUE(extension);
217 std::string id = extension->id(); 231 std::string id = extension->id();
218 232
219 // Try a feed with a link with an onclick handler (before r27440 this would 233 // Try a feed with a link with an onclick handler (before r27440 this would
220 // trigger a NOTREACHED). 234 // trigger a NOTREACHED).
221 NavigateToFeedAndValidate(test_server(), kValidFeed0, browser(), id, true, 235 NavigateToFeedAndValidate(test_server(), kValidFeed0, browser(), id, true,
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 std::string id = extension->id(); 351 std::string id = extension->id();
338 352
339 // Valid feed but containing no links. 353 // Valid feed but containing no links.
340 NavigateToFeedAndValidate( 354 NavigateToFeedAndValidate(
341 test_server(), kValidFeedNoLinks, browser(), id, true, 355 test_server(), kValidFeedNoLinks, browser(), id, true,
342 "Feed for MyFeedTitle", 356 "Feed for MyFeedTitle",
343 "Title with no link", 357 "Title with no link",
344 "Desc", 358 "Desc",
345 "No error"); 359 "No error");
346 } 360 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/sandboxed_unpacker_unittest.cc ('k') | chrome/browser/locale_tests_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698