Fix for WebView accessible resources.

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 "components/browsing_data/storage_partition_http_cache_data_remover.h"
@@ skipping 30 matching lines @@
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 #include "extensions/browser/guest_view/web_view/web_view_content_script_manager.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
+#include "extensions/common/manifest_constants.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "url/url_constants.h"
 
 using base::UserMetricsAction;
 using content::GlobalRequestID;
 using content::RenderFrameHost;
+using content::RenderProcessHost;
 using content::ResourceType;
 using content::StoragePartition;
 using content::WebContents;
 using guest_view::GuestViewBase;
 using guest_view::GuestViewEvent;
 using guest_view::GuestViewManager;
 using ui_zoom::ZoomController;
 
 namespace extensions {
 
@@ skipping 186 matching lines @@
   // literal string.
   *in_memory = (site.path() != "/persist");
   // The partition name is user supplied value, which we have encoded when the
   // URL was created, so it needs to be decoded.
   *partition_name =
       net::UnescapeURLComponent(site.query(), net::UnescapeRule::NORMAL);
   return true;
 }
 
 // static
+std::string WebViewGuest::GetPartitionID(
+    const RenderProcessHost* render_process_host) {
+  WebViewRendererState* renderer_state = WebViewRendererState::GetInstance();
+  int process_id = render_process_host->GetID();
+  std::string partition_id;
+  if (renderer_state->IsGuest(process_id))
+    renderer_state->GetPartitionID(process_id, &partition_id);

[not at google - send to devlin, 2015/08/31 18:31:44]

There is a threading mismatch here. WebViewRendererState says onto to access it
on the IO thread, but I see UI thread accessors.

[paulmeyer, 2015/08/31 21:40:08]

You may have been looking at an out-of-date version of WebViewRendererState. It
now allows access from UI or IO threads (as of last week).

[not at google - send to devlin, 2015/08/31 21:52:51]

I'm not looking at an old version, I'm looking at git trunk:

https://chromium.googlesource.com/chromium/src/+/master/extensions/browser/gu...

That file says the equivalent of "call on IO thread" 5 times, in this case:

  // Looks up the partition info for the embedder <webview> for a given guest
  // process. Called on the IO thread.

[paulmeyer, 2015/09/02 13:43:57]

Oh, I see. Those comments are stale, so I'll remove them.

+
+  return partition_id;
+}
+
+// static
 const char WebViewGuest::Type[] = "webview";
 
 // static
 int WebViewGuest::GetOrGenerateRulesRegistryID(
     int embedder_process_id,
     int webview_instance_id) {
   bool is_web_view = embedder_process_id && webview_instance_id;
   if (!is_web_view)
     return RulesRegistryService::kDefaultRulesRegistryID;
 
@@ skipping 1184 matching lines @@
     scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
     DispatchEventToView(
         new GuestViewEvent(webview::kEventExitFullscreen, args.Pass()));
   }
   // Since we changed fullscreen state, sending a Resize message ensures that
   // renderer/ sees the change.
   web_contents()->GetRenderViewHost()->WasResized();
 }
 
 }  // namespace extensions