Enable webview tag in webui

extensions/browser/guest_view/web_view/web_view_guest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 166 matching lines @@
   return webview::kAPINamespace;
 }
 
 int WebViewGuest::GetTaskPrefix() const {
   return IDS_EXTENSION_TASK_MANAGER_WEBVIEW_TAG_PREFIX;
 }
 
 void WebViewGuest::CreateWebContents(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,
+    const GURL& embedder_site_url,
     const base::DictionaryValue& create_params,
     const WebContentsCreatedCallback& callback) {
   content::RenderProcessHost* embedder_render_process_host =
       content::RenderProcessHost::FromID(embedder_render_process_id);
   std::string storage_partition_id;
   bool persist_storage = false;
   std::string storage_partition_string;
   ParsePartitionParam(create_params, &storage_partition_id, &persist_storage);
   // Validate that the partition id coming from the renderer is valid UTF-8,
   // since we depend on this in other parts of the code, such as FilePath
   // creation. If the validation fails, treat it as a bad message and kill the
   // renderer process.
   if (!base::IsStringUTF8(storage_partition_id)) {
     content::RecordAction(
         base::UserMetricsAction("BadMessageTerminate_BPGM"));
     base::KillProcess(
         embedder_render_process_host->GetHandle(),
         content::RESULT_CODE_KILLED_BAD_MESSAGE, false);
     callback.Run(NULL);
     return;
   }
   std::string url_encoded_partition = net::EscapeQueryParamValue(
       storage_partition_id, false);
   // The SiteInstance of a given webview tag is based on the fact that it's
-  // a guest process in addition to which platform application the tag
-  // belongs to and what storage partition is in use, rather than the URL
-  // that the tag is being navigated to.
+  // a guest process in addition to which platform application or which WebUI
+  // page the tag belongs to and what storage partition is in use, rather than
+  // the URL that the tag is being navigated to.
+  std::string partition_domain;
+  if (embedder_extension_id.empty()) {
+    DCHECK(content::ChildProcessSecurityPolicy::GetInstance()->HasWebUIBindings(
+        embedder_render_process_id));
+    partition_domain = embedder_site_url.host();
+  } else {
+    partition_domain = embedder_extension_id;
+  }
   GURL guest_site(base::StringPrintf("%s://%s/%s?%s",
                                      content::kGuestScheme,
-                                     embedder_extension_id.c_str(),
+                                     partition_domain.c_str(),
                                      persist_storage ? "persist" : "",
                                      url_encoded_partition.c_str()));
 
   // If we already have a webview tag in the same app using the same storage
   // partition, we should use the same SiteInstance so the existing tag and
   // the new tag can script each other.
   GuestViewManager* guest_view_manager =
       GuestViewManager::FromBrowserContext(
           embedder_render_process_host->GetBrowserContext());
   content::SiteInstance* guest_site_instance =
@@ skipping 507 matching lines @@
 void WebViewGuest::PushWebViewStateToIOThread() {
   const GURL& site_url = web_contents()->GetSiteInstance()->GetSiteURL();
   std::string partition_domain;
   std::string partition_id;
   bool in_memory;
   if (!GetGuestPartitionConfigForSite(
           site_url, &partition_domain, &partition_id, &in_memory)) {
     NOTREACHED();
     return;
   }
-  DCHECK(embedder_extension_id() == partition_domain);
 
   WebViewRendererState::WebViewInfo web_view_info;
   web_view_info.embedder_process_id = embedder_render_process_id();
   web_view_info.instance_id = view_instance_id();
   web_view_info.partition_id = partition_id;
   web_view_info.embedder_extension_id = embedder_extension_id();
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
@@ skipping 314 matching lines @@
        it != pending_new_windows.end(); ++it) {
     it->first->Destroy();
   }
   // All pending windows should be removed from the set after Destroy() is
   // called on all of them.
   DCHECK(pending_new_windows_.empty());
 }
 
 GURL WebViewGuest::ResolveURL(const std::string& src) {
   if (!in_extension()) {
-    NOTREACHED();
     return GURL(src);
   }
 
   GURL default_url(base::StringPrintf("%s://%s/",
                                       kExtensionScheme,
                                       embedder_extension_id().c_str()));
   return default_url.Resolve(src);
 }
 
 void WebViewGuest::OnWebViewNewWindowResponse(
     int new_window_instance_id,
     bool allow,
     const std::string& user_input) {
   WebViewGuest* guest =
       WebViewGuest::From(embedder_render_process_id(), new_window_instance_id);
   if (!guest)
     return;
 
   if (!allow)
     guest->Destroy();
 }
 
 }  // namespace extensions