| OLD | NEW |
| 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/url_constants.h" | 8 #include "chrome/common/url_constants.h" |
| 9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 141 |
| 142 ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); | 142 ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); |
| 143 | 143 |
| 144 // Navigate to the feed page. | 144 // Navigate to the feed page. |
| 145 GURL feed_url = test_server()->GetURL(kFeedPageMultiRel); | 145 GURL feed_url = test_server()->GetURL(kFeedPageMultiRel); |
| 146 ui_test_utils::NavigateToURL(browser(), feed_url); | 146 ui_test_utils::NavigateToURL(browser(), feed_url); |
| 147 // We should now have one page action ready to go in the LocationBar. | 147 // We should now have one page action ready to go in the LocationBar. |
| 148 ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); | 148 ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); |
| 149 } | 149 } |
| 150 | 150 |
| 151 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedValidFeed1) { | 151 // This test is flaky on all platforms; see http://crbug.com/340354 |
| 152 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed1) { |
| 152 ASSERT_TRUE(test_server()->Start()); | 153 ASSERT_TRUE(test_server()->Start()); |
| 153 | 154 |
| 154 const Extension* extension = LoadExtension( | 155 const Extension* extension = LoadExtension( |
| 155 test_data_dir_.AppendASCII("subscribe_page_action")); | 156 test_data_dir_.AppendASCII("subscribe_page_action")); |
| 156 ASSERT_TRUE(extension); | 157 ASSERT_TRUE(extension); |
| 157 std::string id = extension->id(); | 158 std::string id = extension->id(); |
| 158 | 159 |
| 159 NavigateToFeedAndValidate(test_server(), kValidFeed1, browser(), id, true, | 160 NavigateToFeedAndValidate(test_server(), kValidFeed1, browser(), id, true, |
| 160 "Feed for MyFeedTitle", | 161 "Feed for MyFeedTitle", |
| 161 "Title 1", | 162 "Title 1", |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 std::string id = extension->id(); | 338 std::string id = extension->id(); |
| 338 | 339 |
| 339 // Valid feed but containing no links. | 340 // Valid feed but containing no links. |
| 340 NavigateToFeedAndValidate( | 341 NavigateToFeedAndValidate( |
| 341 test_server(), kValidFeedNoLinks, browser(), id, true, | 342 test_server(), kValidFeedNoLinks, browser(), id, true, |
| 342 "Feed for MyFeedTitle", | 343 "Feed for MyFeedTitle", |
| 343 "Title with no link", | 344 "Title with no link", |
| 344 "Desc", | 345 "Desc", |
| 345 "No error"); | 346 "No error"); |
| 346 } | 347 } |
| OLD | NEW |