chrome/browser/extensions/extension_resource_request_policy_apitest.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

Unified Diff: chrome/browser/extensions/extension_resource_request_policy_apitest.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, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_process_manager.cc ('k') | chrome/browser/extensions/extension_startup_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_resource_request_policy_apitest.cc

===================================================================

--- chrome/browser/extensions/extension_resource_request_policy_apitest.cc (revision 145001)

+++ chrome/browser/extensions/extension_resource_request_policy_apitest.cc (working copy)

@@ -5,6 +5,7 @@

#include "base/logging.h"

#include "chrome/browser/extensions/extension_apitest.h"

#include "chrome/browser/ui/browser.h"

+#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/ui_test_utils.h"

#include "content/public/browser/web_contents.h"

@@ -47,7 +48,7 @@

browser(), web_resource.ReplaceComponents(make_host_a_com));

std::string result;

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Loaded");

@@ -59,7 +60,7 @@

"non_existent_extension.html"));

ui_test_utils::NavigateToURL(browser(), non_existent_extension);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Image failed to load");

@@ -73,7 +74,7 @@

ui_test_utils::NavigateToURL(browser(),

GURL(std::string("data:text/html;charset=utf-8,") + file_source));

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Loaded");

@@ -87,7 +88,7 @@

browser(),

GURL("chrome-extension://pbkkcbgdkliohhfaeefcijaghglkahja/index.html"));

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Loaded");

@@ -143,7 +144,7 @@

"web_accessible/accessible_resource.html"));

ui_test_utils::NavigateToURL(browser(), accessible_resource);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ("Loaded", result);

@@ -155,7 +156,7 @@

ui_test_utils::NavigateToURL(

browser(), xhr_accessible_resource);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ("XHR completed with status: 200", result);

@@ -167,7 +168,7 @@

ui_test_utils::NavigateToURL(

browser(), xhr_inaccessible_resource);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ("XHR failed to load resource", result);

@@ -178,7 +179,7 @@

"web_accessible/nonaccessible_resource.html"));

ui_test_utils::NavigateToURL(browser(), nonaccessible_resource);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ("Image failed to load", result);

@@ -189,7 +190,7 @@

"web_accessible/nonexistent_resource.html"));

ui_test_utils::NavigateToURL(browser(), nonexistent_resource);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ("Image failed to load", result);

@@ -200,7 +201,7 @@

"web_accessible/nonaccessible_chrome_resource_scheme.html"));

ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ("Loading CER:// failed.", result);