| Index: content/browser/renderer_host/render_process_host_browsertest.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_process_host_browsertest.cc (revision 116244)
|
| +++ content/browser/renderer_host/render_process_host_browsertest.cc (working copy)
|
| @@ -158,8 +158,8 @@
|
|
|
| int tab_count = 1;
|
| int host_count = 1;
|
| - TabContents* tab1 = NULL;
|
| - TabContents* tab2 = NULL;
|
| + WebContents* tab1 = NULL;
|
| + WebContents* tab2 = NULL;
|
| content::RenderProcessHost* rph1 = NULL;
|
| content::RenderProcessHost* rph2 = NULL;
|
| content::RenderProcessHost* rph3 = NULL;
|
| @@ -172,7 +172,7 @@
|
| GURL newtab(chrome::kTestNewTabURL);
|
| ui_test_utils::NavigateToURL(browser(), newtab);
|
| EXPECT_EQ(tab_count, browser()->tab_count());
|
| - tab1 = browser()->GetTabContentsAt(tab_count - 1);
|
| + tab1 = browser()->GetWebContentsAt(tab_count - 1);
|
| rph1 = tab1->GetRenderProcessHost();
|
| EXPECT_EQ(tab1->GetURL(), newtab);
|
| EXPECT_EQ(host_count, RenderProcessHostCount());
|
| @@ -185,7 +185,7 @@
|
| tab_count++;
|
| host_count++;
|
| EXPECT_EQ(tab_count, browser()->tab_count());
|
| - tab1 = browser()->GetTabContentsAt(tab_count - 1);
|
| + tab1 = browser()->GetWebContentsAt(tab_count - 1);
|
| rph2 = tab1->GetRenderProcessHost();
|
| EXPECT_EQ(tab1->GetURL(), page1);
|
| EXPECT_EQ(host_count, RenderProcessHostCount());
|
| @@ -198,7 +198,7 @@
|
| ui_test_utils::WaitForNewTab(browser());
|
| tab_count++;
|
| EXPECT_EQ(tab_count, browser()->tab_count());
|
| - tab2 = browser()->GetTabContentsAt(tab_count - 1);
|
| + tab2 = browser()->GetWebContentsAt(tab_count - 1);
|
| EXPECT_EQ(tab2->GetURL(), page2);
|
| EXPECT_EQ(host_count, RenderProcessHostCount());
|
| EXPECT_EQ(tab2->GetRenderProcessHost(), rph2);
|
| @@ -213,7 +213,7 @@
|
| ui_test_utils::WaitForNewTab(browser());
|
| tab_count++;
|
| EXPECT_EQ(tab_count, browser()->tab_count());
|
| - tab2 = browser()->GetTabContentsAt(tab_count - 1);
|
| + tab2 = browser()->GetWebContentsAt(tab_count - 1);
|
| EXPECT_EQ(tab2->GetURL(), history);
|
| EXPECT_EQ(host_count, RenderProcessHostCount());
|
| EXPECT_EQ(tab2->GetRenderProcessHost(), rph1);
|
| @@ -231,7 +231,7 @@
|
| host_count++;
|
| #endif
|
| EXPECT_EQ(tab_count, browser()->tab_count());
|
| - tab1 = browser()->GetTabContentsAt(tab_count - 1);
|
| + tab1 = browser()->GetWebContentsAt(tab_count - 1);
|
| rph3 = tab1->GetRenderProcessHost();
|
| EXPECT_EQ(tab1->GetURL(), bookmarks);
|
| EXPECT_EQ(host_count, RenderProcessHostCount());
|
|
|