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

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

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
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/browser_tabstrip.h"
7 #include "chrome/common/extensions/extension.h" 8 #include "chrome/common/extensions/extension.h"
8 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
9 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
10 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
11 12
12 using content::WebContents; 13 using content::WebContents;
13 using extensions::Extension; 14 using extensions::Extension;
14 15
15 namespace { 16 namespace {
16 17
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 const std::string& expected_item_desc, 105 const std::string& expected_item_desc,
105 const std::string& expected_error) { 106 const std::string& expected_error) {
106 if (sniff_xml_type) { 107 if (sniff_xml_type) {
107 // TODO(finnur): Implement this is a non-flaky way. 108 // TODO(finnur): Implement this is a non-flaky way.
108 } 109 }
109 110
110 // Navigate to the subscribe page directly. 111 // Navigate to the subscribe page directly.
111 ui_test_utils::NavigateToURL(browser, 112 ui_test_utils::NavigateToURL(browser,
112 GetFeedUrl(server, url, true, extension_id)); 113 GetFeedUrl(server, url, true, extension_id));
113 114
114 WebContents* tab = browser->GetActiveWebContents(); 115 WebContents* tab = chrome::GetActiveWebContents(browser);
115 ASSERT_TRUE(ValidatePageElement(tab, 116 ASSERT_TRUE(ValidatePageElement(tab,
116 L"", 117 L"",
117 jscript_feed_title, 118 jscript_feed_title,
118 expected_feed_title)); 119 expected_feed_title));
119 ASSERT_TRUE(ValidatePageElement(tab, 120 ASSERT_TRUE(ValidatePageElement(tab,
120 L"//html/body/div/iframe[1]", 121 L"//html/body/div/iframe[1]",
121 jscript_anchor, 122 jscript_anchor,
122 expected_item_title)); 123 expected_item_title));
123 ASSERT_TRUE(ValidatePageElement(tab, 124 ASSERT_TRUE(ValidatePageElement(tab,
124 L"//html/body/div/iframe[1]", 125 L"//html/body/div/iframe[1]",
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 std::string id = extension->id(); 339 std::string id = extension->id();
339 340
340 // Valid feed but containing no links. 341 // Valid feed but containing no links.
341 NavigateToFeedAndValidate( 342 NavigateToFeedAndValidate(
342 test_server(), kValidFeedNoLinks, browser(), id, true, 343 test_server(), kValidFeedNoLinks, browser(), id, true,
343 "Feed for MyFeedTitle", 344 "Feed for MyFeedTitle",
344 "Title with no link", 345 "Title with no link",
345 "Desc", 346 "Desc",
346 "No error"); 347 "No error");
347 } 348 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/process_management_browsertest.cc ('k') | chrome/browser/extensions/web_contents_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698