| Index: chrome/browser/extensions/chrome_app_api_browsertest.cc
|
| diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc
|
| index c0b3eae315ca14f82a4f0d26ec72412ba110c2dc..0374221fe1946e2d4dfccd14a926e32daa75bca2 100644
|
| --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc
|
| +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc
|
| @@ -32,7 +32,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest {
|
| bool result;
|
| CHECK(
|
| ui_test_utils::ExecuteJavaScriptAndExtractBool(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| frame_xpath, get_app_is_installed, &result));
|
| return result;
|
| }
|
| @@ -45,7 +45,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest {
|
| std::string result;
|
| CHECK(
|
| ui_test_utils::ExecuteJavaScriptAndExtractString(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| frame_xpath, get_app_install_state, &result));
|
| return result;
|
| }
|
| @@ -58,7 +58,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest {
|
| std::string result;
|
| CHECK(
|
| ui_test_utils::ExecuteJavaScriptAndExtractString(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| frame_xpath, get_app_install_state, &result));
|
| return result;
|
| }
|
| @@ -112,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {
|
| std::string result;
|
| ASSERT_TRUE(
|
| ui_test_utils::ExecuteJavaScriptAndExtractString(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| L"", get_app_details, &result));
|
| EXPECT_EQ("null", result);
|
|
|
| @@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {
|
| ui_test_utils::NavigateToURL(browser(), app_url);
|
| ASSERT_TRUE(
|
| ui_test_utils::ExecuteJavaScriptAndExtractString(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| L"", get_app_details, &result));
|
| scoped_ptr<DictionaryValue> app_details(
|
| static_cast<DictionaryValue*>(base::JSONReader::Read(result)));
|
| @@ -138,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {
|
| // that isInstalled should have the initial value.
|
| ASSERT_TRUE(
|
| ui_test_utils::ExecuteJavaScriptAndExtractString(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| L"",
|
| L"window.domAutomationController.send("
|
| L" function() {"
|
| @@ -189,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) {
|
| bool result = false;
|
| ASSERT_TRUE(
|
| ui_test_utils::ExecuteJavaScriptAndExtractBool(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| L"", test_unsuccessful_access, &result));
|
| EXPECT_TRUE(result);
|
|
|
| @@ -202,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) {
|
| std::string json;
|
| ASSERT_TRUE(
|
| ui_test_utils::ExecuteJavaScriptAndExtractString(
|
| - browser()->GetSelectedWebContents()->GetRenderViewHost(),
|
| + browser()->GetActiveWebContents()->GetRenderViewHost(),
|
| L"", get_details_for_frame, &json));
|
|
|
| scoped_ptr<DictionaryValue> app_details(
|
|
|