| Index: chrome/browser/extensions/webstore_inline_install_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/webstore_inline_install_browsertest.cc (revision 116109)
|
| +++ chrome/browser/extensions/webstore_inline_install_browsertest.cc (working copy)
|
| @@ -16,12 +16,14 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| -#include "content/browser/tab_contents/tab_contents.h"
|
| #include "content/public/browser/notification_types.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "net/base/host_port_pair.h"
|
| #include "net/base/mock_host_resolver.h"
|
|
|
| +using content::WebContents;
|
| +
|
| const char kWebstoreDomain[] = "cws.com";
|
| const char kAppDomain[] = "app.com";
|
| const char kNonAppDomain[] = "nonapp.com";
|
| @@ -71,7 +73,7 @@
|
| std::string script = StringPrintf("%s('%s')", test_function_name.c_str(),
|
| test_gallery_url_.c_str());
|
| ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
|
| - browser()->GetSelectedTabContents()->GetRenderViewHost(), L"",
|
| + browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
|
| UTF8ToWide(script), &result));
|
| EXPECT_TRUE(result);
|
| }
|
| @@ -131,8 +133,8 @@
|
| if (browser()->tabstrip_model()->count() == 1) {
|
| ui_test_utils::WaitForNewTab(browser());
|
| }
|
| - TabContents* tab_contents = browser()->GetSelectedTabContents();
|
| - EXPECT_EQ(GURL("http://cws.com/show-me-the-money"), tab_contents->GetURL());
|
| + WebContents* web_contents = browser()->GetSelectedWebContents();
|
| + EXPECT_EQ(GURL("http://cws.com/show-me-the-money"), web_contents->GetURL());
|
| }
|
|
|
| // The unpack failure test needs to use a different install .crx, which is
|
|
|