diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 04:32:07 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 04:32:07 +0000 |
| commit | aa8b7466300b3b09b5552e7aa85711bd8bff2211 (patch) | |
| tree | 556f48f817faee8e50ff07a1785c6f785735a9b4 /content | |
| parent | 3630942bd18a8f06d67412b737340a2eaa845753 (diff) | |
| download | chromium_src-aa8b7466300b3b09b5552e7aa85711bd8bff2211.zip chromium_src-aa8b7466300b3b09b5552e7aa85711bd8bff2211.tar.gz chromium_src-aa8b7466300b3b09b5552e7aa85711bd8bff2211.tar.bz2 | |
Changing the guest scheme to "chrome-guest"
BUG=158623
Review URL: https://chromiumcodereview.appspot.com/11344038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/site_instance_impl_unittest.cc | 8 | ||||
| -rw-r--r-- | content/browser/web_contents/render_view_host_manager_unittest.cc | 2 | ||||
| -rw-r--r-- | content/public/common/url_constants.cc | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc index 027a670..9a40bd2 100644 --- a/content/browser/site_instance_impl_unittest.cc +++ b/content/browser/site_instance_impl_unittest.cc @@ -365,9 +365,11 @@ TEST_F(SiteInstanceTest, GetSiteForURL) { test_url = GURL("file:///C:/Downloads/"); EXPECT_EQ(GURL(), SiteInstanceImpl::GetSiteForURL(NULL, test_url)); - test_url = GURL("guest://abc123"); - EXPECT_EQ(GURL("guest://abc123"), SiteInstanceImpl::GetSiteForURL( - NULL, test_url)); + std::string guest_url(chrome::kGuestScheme); + guest_url.append("://abc123"); + test_url = GURL(guest_url); + EXPECT_EQ(test_url, SiteInstanceImpl::GetSiteForURL(NULL, test_url)); + // TODO(creis): Do we want to special case file URLs to ensure they have // either no site or a special "file://" site? We currently return // "file://home/" as the site, which seems broken. diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc index a1d5bb3..5dec92c 100644 --- a/content/browser/web_contents/render_view_host_manager_unittest.cc +++ b/content/browser/web_contents/render_view_host_manager_unittest.cc @@ -871,7 +871,7 @@ TEST_F(RenderViewHostManagerTest, EnableWebUIWithSwappedOutOpener) { TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) { TestNotificationTracker notifications; - GURL guest_url("guest://abc123"); + GURL guest_url(std::string(chrome::kGuestScheme).append("://abc123")); SiteInstance* instance = SiteInstance::CreateForURL(browser_context(), guest_url); scoped_ptr<TestWebContents> web_contents( diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc index 8337146..3372916 100644 --- a/content/public/common/url_constants.cc +++ b/content/public/common/url_constants.cc @@ -20,7 +20,7 @@ const char kDataScheme[] = "data"; const char kFileScheme[] = "file"; const char kFileSystemScheme[] = "filesystem"; const char kFtpScheme[] = "ftp"; -const char kGuestScheme[] = "guest"; +const char kGuestScheme[] = "chrome-guest"; const char kHttpScheme[] = "http"; const char kHttpsScheme[] = "https"; const char kJavaScriptScheme[] = "javascript"; |