Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Unified Diff: content/browser/renderer_host/render_view_host_manager_browsertest.cc

Issue 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_view_host_manager_browsertest.cc
===================================================================
--- content/browser/renderer_host/render_view_host_manager_browsertest.cc (revision 118703)
+++ content/browser/renderer_host/render_view_host_manager_browsertest.cc (working copy)
@@ -9,7 +9,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/site_instance.h"
+#include "content/browser/site_instance_impl.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_observer.h"
@@ -59,7 +59,7 @@
test_server()->GetURL(replacement_path));
// Get the original SiteInstance for later comparison.
- scoped_refptr<SiteInstance> orig_site_instance(
+ scoped_refptr<content::SiteInstance> orig_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_TRUE(orig_site_instance != NULL);
@@ -89,7 +89,7 @@
pending_render_view_host());
// Should have a new SiteInstance.
- scoped_refptr<SiteInstance> noref_blank_site_instance(
+ scoped_refptr<content::SiteInstance> noref_blank_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_NE(orig_site_instance, noref_blank_site_instance);
}
@@ -115,7 +115,7 @@
test_server()->GetURL(replacement_path));
// Get the original SiteInstance for later comparison.
- scoped_refptr<SiteInstance> orig_site_instance(
+ scoped_refptr<content::SiteInstance> orig_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_TRUE(orig_site_instance != NULL);
@@ -141,7 +141,7 @@
browser()->GetSelectedWebContents()->GetURL().path());
// Should have the same SiteInstance.
- scoped_refptr<SiteInstance> blank_site_instance(
+ scoped_refptr<content::SiteInstance> blank_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_EQ(orig_site_instance, blank_site_instance);
}
@@ -167,7 +167,7 @@
test_server()->GetURL(replacement_path));
// Get the original SiteInstance for later comparison.
- scoped_refptr<SiteInstance> orig_site_instance(
+ scoped_refptr<content::SiteInstance> orig_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_TRUE(orig_site_instance != NULL);
@@ -189,7 +189,7 @@
browser()->GetSelectedWebContents()->GetURL().path());
// Should have the same SiteInstance.
- scoped_refptr<SiteInstance> noref_site_instance(
+ scoped_refptr<content::SiteInstance> noref_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_EQ(orig_site_instance, noref_site_instance);
}
@@ -215,7 +215,7 @@
test_server()->GetURL(replacement_path));
// Get the original SiteInstance for later comparison.
- scoped_refptr<SiteInstance> orig_site_instance(
+ scoped_refptr<content::SiteInstance> orig_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_TRUE(orig_site_instance != NULL);
@@ -223,7 +223,7 @@
ui_test_utils::NavigateToURL(browser(), https_server.GetURL("nocontent"));
// We should still be looking at the normal page.
- scoped_refptr<SiteInstance> post_nav_site_instance(
+ scoped_refptr<content::SiteInstance> post_nav_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_EQ(orig_site_instance, post_nav_site_instance);
EXPECT_EQ("/files/click-noreferrer-links.html",
@@ -247,7 +247,7 @@
browser()->GetSelectedWebContents()->GetURL().path());
// Should have the same SiteInstance.
- scoped_refptr<SiteInstance> noref_site_instance(
+ scoped_refptr<content::SiteInstance> noref_site_instance(
browser()->GetSelectedWebContents()->GetSiteInstance());
EXPECT_EQ(orig_site_instance, noref_site_instance);
}

Powered by Google App Engine
This is Rietveld 408576698