Index: content/browser/tab_contents/test_tab_contents.cc |
=================================================================== |
--- content/browser/tab_contents/test_tab_contents.cc (revision 118703) |
+++ content/browser/tab_contents/test_tab_contents.cc (working copy) |
@@ -10,7 +10,7 @@ |
#include "content/browser/renderer_host/mock_render_process_host.h" |
#include "content/browser/renderer_host/render_view_host.h" |
#include "content/browser/renderer_host/test_render_view_host.h" |
-#include "content/browser/site_instance.h" |
+#include "content/browser/site_instance_impl.h" |
#include "content/browser/tab_contents/navigation_entry_impl.h" |
#include "content/common/view_messages.h" |
#include "content/public/common/page_transition_types.h" |
@@ -21,7 +21,7 @@ |
using content::WebContents; |
TestTabContents::TestTabContents(content::BrowserContext* browser_context, |
- SiteInstance* instance) |
+ content::SiteInstance* instance) |
: TabContents(browser_context, instance, MSG_ROUTING_NONE, NULL, NULL), |
transition_cross_site(false), |
delegate_view_override_(NULL), |
@@ -86,7 +86,7 @@ |
WebContents* TestTabContents::Clone() { |
TabContents* tc = new TestTabContents( |
GetBrowserContext(), |
- SiteInstance::CreateSiteInstance(GetBrowserContext())); |
+ content::SiteInstance::CreateSiteInstance(GetBrowserContext())); |
tc->GetControllerImpl().CopyStateFrom(controller_); |
return tc; |
} |
@@ -144,17 +144,19 @@ |
} |
void TestTabContents::ExpectSetHistoryLengthAndPrune( |
- const SiteInstance* site_instance, |
+ const content::SiteInstance* site_instance, |
int history_length, |
int32 min_page_id) { |
expect_set_history_length_and_prune_ = true; |
- expect_set_history_length_and_prune_site_instance_ = site_instance; |
+ expect_set_history_length_and_prune_site_instance_ = |
+ reinterpret_cast<const SiteInstanceImpl*>(site_instance); |
jam
2012/01/24 03:29:33
ditto
ananta
2012/01/24 23:46:26
Done.
|
expect_set_history_length_and_prune_history_length_ = history_length; |
expect_set_history_length_and_prune_min_page_id_ = min_page_id; |
} |
void TestTabContents::SetHistoryLengthAndPrune( |
- const SiteInstance* site_instance, int history_length, int32 min_page_id) { |
+ const content::SiteInstance* site_instance, int history_length, |
+ int32 min_page_id) { |
EXPECT_TRUE(expect_set_history_length_and_prune_); |
expect_set_history_length_and_prune_ = false; |
EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance); |