summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 11:36:16 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 11:36:16 +0000
commit8cb5d5b5406f5b3c18b7882c27c87938a81b584b (patch)
treedbdc64a8ea9b1855d65b1ab228bc6fb59112f337 /chrome/browser/tabs
parent8db8746942a16ce493f8c4eb3aeebf2c36e38946 (diff)
downloadchromium_src-8cb5d5b5406f5b3c18b7882c27c87938a81b584b.zip
chromium_src-8cb5d5b5406f5b3c18b7882c27c87938a81b584b.tar.gz
chromium_src-8cb5d5b5406f5b3c18b7882c27c87938a81b584b.tar.bz2
[GTTF] Reduce header dependencies in chrome.
BUG=none TEST=If it compiles it is perfect. Review URL: http://codereview.chromium.org/585008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r--chrome/browser/tabs/tab_strip_model.cc2
-rw-r--r--chrome/browser/tabs/tab_strip_model_unittest.cc7
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 5a4368f..26c0d49 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -747,7 +747,7 @@ bool TabStripModel::InternalCloseTabs(std::vector<int> indices,
}
TabContents* detached_contents = GetContentsAt(indices[i]);
- RenderProcessHost* process = detached_contents->process();
+ RenderProcessHost* process = detached_contents->GetRenderProcessHost();
std::map<RenderProcessHost*, size_t>::iterator iter =
processes.find(process);
if (iter == processes.end()) {
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 11f2f73..2329f0c 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -95,7 +95,8 @@ class TabStripModelTest : public RenderViewHostTestHarness {
TabContents* retval = new TabContents(profile(),
tab_contents->render_view_host()->site_instance(), MSG_ROUTING_NONE,
NULL);
- EXPECT_EQ(retval->process(), tab_contents->process());
+ EXPECT_EQ(retval->GetRenderProcessHost(),
+ tab_contents->GetRenderProcessHost());
return retval;
}
@@ -1315,7 +1316,7 @@ TEST_F(TabStripModelTest, FastShutdown) {
tabstrip.CloseAllTabs();
// On a mock RPH this checks whether we *attempted* fast shutdown.
// A real RPH would reject our attempt since there is an unload handler.
- EXPECT_TRUE(contents1->process()->fast_shutdown_started());
+ EXPECT_TRUE(contents1->GetRenderProcessHost()->fast_shutdown_started());
EXPECT_EQ(2, tabstrip.count());
delegate.set_run_unload_listener(false);
@@ -1336,7 +1337,7 @@ TEST_F(TabStripModelTest, FastShutdown) {
tabstrip.AppendTabContents(contents2, true);
tabstrip.CloseTabContentsAt(1);
- EXPECT_FALSE(contents1->process()->fast_shutdown_started());
+ EXPECT_FALSE(contents1->GetRenderProcessHost()->fast_shutdown_started());
EXPECT_EQ(1, tabstrip.count());
tabstrip.CloseAllTabs();