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 889d28f71ed6d7d7b6d862fd1233e97978d8c767..2df3e15d3dce55952ee734df11818d126bec3f7b 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -12,6 +12,12 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "chrome/browser/extensions/extension_renderer_state.h"
+
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/guest_view/web_view/web_view_guest.h"
+#endif
+
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
@@ -67,8 +73,9 @@ bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_V8HeapStats, OnV8HeapStats)
     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)
@@ -192,14 +199,39 @@ 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);
+
+#if defined(ENABLE_EXTENSIONS)
+  bool is_web_view_guest =
+      ExtensionRendererState::GetInstance()->IsWebViewRenderer(
+          render_process_id_);
+  if (is_web_view_guest) {
+    // Record access to file system for potential display in UI.
+    BrowserThread::PostTask(BrowserThread::UI,
+                            FROM_HERE,
+                            base::Bind(&WebViewGuest::FileSystemAccessedSync,
+                                       render_process_id_,
+                                       render_frame_id,
+                                       origin_url,
+                                       !allowed,
+                                       reply_msg));
+    return;
+  }
+#endif
+  ChromeViewHostMsg_RequestFileSystemAccessSync::WriteReplyParams(reply_msg,
+                                                                  allowed);
+  Send(reply_msg);
   // Record access to file system for potential display in UI.
   BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
+      BrowserThread::UI,
+      FROM_HERE,
       base::Bind(&TabSpecificContentSettings::FileSystemAccessed,
-                 render_process_id_, render_frame_id, origin_url, !*allowed));
+                 render_process_id_,
+                 render_frame_id,
+                 origin_url,
+                 !allowed));
 }
 
 void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync(
@@ -211,20 +243,36 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync(
 
   bool allowed =
       cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url);
+
+#if defined(ENABLE_EXTENSIONS)
+  bool is_web_view_guest =
+      ExtensionRendererState::GetInstance()->IsWebViewRenderer(
+          render_process_id_);
+  if (is_web_view_guest) {
+    // Record access to file system for potential display in UI.
+    BrowserThread::PostTask(BrowserThread::UI,
+                            FROM_HERE,
+                            base::Bind(&WebViewGuest::FileSystemAccessedAsync,
+                                       render_process_id_,
+                                       render_frame_id,
+                                       request_id,
+                                       origin_url,
+                                       !allowed));
+    return;
+  }
+#endif
+  Send(new ChromeViewMsg_RequestFileSystemAccessAsyncResponse(render_frame_id,
+                                                              request_id,
+                                                              allowed));
   // 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));
+      BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(&TabSpecificContentSettings::FileSystemAccessed,
+                render_process_id_,
+                render_frame_id,
+                origin_url,
+                !allowed));
 }
 
 void ChromeRenderMessageFilter::OnAllowIndexedDB(int render_frame_id,