Plumb file system permission into WebviewGuest.

chrome/browser/renderer_host/chrome_render_message_filter.cc

Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index f50fb11bdd247aeb51c0a6fae8fe715db38a2f3b..b741b82cecab2c5d721681e4355875be823d11c8 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -19,6 +19,8 @@
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/api/messaging/message_service.h"
+#include "chrome/browser/extensions/extension_renderer_state.h"
+#include "chrome/browser/guest_view/web_view/web_view_guest.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/predictor.h"
@@ -123,8 +125,9 @@ bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
                         OnAddEventToExtensionActivityLog);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDatabase, OnAllowDatabase)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDOMStorage, OnAllowDOMStorage)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RequestFileSystemAccessSync,
-                        OnRequestFileSystemAccessSync)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(
+        ChromeViewHostMsg_RequestFileSystemAccessSync,
+        OnRequestFileSystemAccessSync)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RequestFileSystemAccessAsync,
                         OnRequestFileSystemAccessAsync)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowIndexedDB, OnAllowIndexedDB)
@@ -439,14 +442,36 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync(
     int render_frame_id,
     const GURL& origin_url,
     const GURL& top_origin_url,
-    bool* allowed) {
-  *allowed =
+    IPC::Message* reply_msg) {
+  bool allowed =
       cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url);
-  // Record access to file system for potential display in UI.
+
+  bool is_web_view_guest =
+      ExtensionRendererState::GetInstance()->IsWebViewRenderer(
+          render_process_id_);
+  if (!is_web_view_guest) {
+    ChromeViewHostMsg_RequestFileSystemAccessSync::WriteReplyParams(reply_msg,
+                                                                    allowed);
+    Send(reply_msg);
+    BrowserThread::PostTask(
+        BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&TabSpecificContentSettings::FileSystemAccessed,
+                   render_process_id_,
+                   render_frame_id,
+                   origin_url,
+                   !allowed));
+    return;
+  }
   BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&TabSpecificContentSettings::FileSystemAccessed,
-                 render_process_id_, render_frame_id, origin_url, !*allowed));
+      BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(&WebViewGuest::FileSystemAccessedSyncDelayReply,

[fsamuel, 2014/05/30 15:13:21]

WebViewGuest::FileSystemAccessedSync is sufficient to distinguish it from the
other method.

[Xi Han, 2014/05/30 18:15:56]

Done.

+                 render_process_id_,
+                 render_frame_id,
+                 origin_url,
+                 reply_msg,
+                 !allowed));
 }
 
 void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync(
@@ -458,20 +483,31 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync(
 
   bool allowed =
       cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url);
-  // Record access to file system for potential display in UI.
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &TabSpecificContentSettings::FileSystemAccessed,
-          render_process_id_,
-          render_frame_id,
-          origin_url,
-          !allowed));
-
-  Send(new ChromeViewMsg_RequestFileSystemAccessAsyncResponse(
-      render_frame_id,
-      request_id,
-      allowed));
+
+  bool is_web_view_guest =
+      ExtensionRendererState::GetInstance()->IsWebViewRenderer(
+          render_process_id_);
+  if (!is_web_view_guest) {
+    Send(new ChromeViewMsg_RequestFileSystemAccessAsyncResponse(
+        render_frame_id, request_id, allowed));
+    BrowserThread::PostTask(
+        BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&TabSpecificContentSettings::FileSystemAccessed,
+                   render_process_id_,
+                   render_frame_id,
+                   origin_url,
+                   !allowed));
+    return;
+  }
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(&WebViewGuest::FileSystemAccessedAsync,
+                                     render_process_id_,
+                                     render_frame_id,
+                                     request_id,
+                                     origin_url,
+                                     !allowed));
 }
 
 void ChromeRenderMessageFilter::OnAllowIndexedDB(int render_frame_id,