Allow webview API in an unblessed extension process

chrome/browser/extensions/api/webview/webview_api.h

Index: chrome/browser/extensions/api/webview/webview_api.h
diff --git a/chrome/browser/extensions/api/webview/webview_api.h b/chrome/browser/extensions/api/webview/webview_api.h
index 59f9d975073894e00ac898bb040e93f78bc46583..c685c6922de4599973fa629cca5bcd3eebe70eea 100644
--- a/chrome/browser/extensions/api/webview/webview_api.h
+++ b/chrome/browser/extensions/api/webview/webview_api.h
@@ -6,10 +6,32 @@
 #define CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEBVIEW_API_H_
 
 #include "chrome/browser/extensions/api/execute_code_function.h"
+#include "chrome/browser/guestview/webview/webview_guest.h"
+
+// WARNING: Webview could be loaded in an unblessed context, thus any new
+// APIs must extend WebviewExtensionFunction/WebviewExecuteCodeFunction which

[not at google - send to devlin, 2013/09/25 23:46:46]

FWIW, it's not totally clear to me (i.e. not clear just from this file) how
WebviewExecuteCodeFunction actually does this (how it's safe); overriding
GetScriptExecutor is a bit vague. A safer way to structure this would be to
delegate to ExecuteScriptFunction rather than extending it, and extend
WebviewExtensionFunction instead. But that would be a more significant change.

[guohui, 2013/09/26 13:58:00]

TODO added.

+// do a process ID check to prevent abuse by normal renderer processes.
 
 namespace extensions {
 
-class WebviewClearDataFunction : public AsyncExtensionFunction {
+// An abstract base class for async webview APIs. It does a process ID check
+// in RunImpl, and then calls RunImplSafe which must be overriden by all
+// subclasses.
+class WebviewExtensionFunction : public AsyncExtensionFunction {
+ public:
+   WebviewExtensionFunction() {}
+
+ protected:
+  virtual ~WebviewExtensionFunction() {}
+
+  // ExtensionFunction implementation.
+  virtual bool RunImpl() OVERRIDE FINAL;
+
+ private:
+  virtual bool RunImplSafe(WebViewGuest* guest) = 0;
+};
+
+class WebviewClearDataFunction : public WebviewExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("webview.clearData", WEBVIEW_CLEARDATA);
 
@@ -18,10 +40,9 @@ class WebviewClearDataFunction : public AsyncExtensionFunction {
  protected:
   virtual ~WebviewClearDataFunction();
 
-  // ExtensionFunction implementation.
-  virtual bool RunImpl() OVERRIDE;
-
  private:
+  virtual bool RunImplSafe(WebViewGuest* guest);
+
   uint32 GetRemovalMask();
   void ClearDataDone();
 
@@ -46,7 +67,8 @@ class WebviewExecuteCodeFunction : public extensions::ExecuteCodeFunction {
   virtual bool Init() OVERRIDE;
   virtual bool ShouldInsertCSS() const OVERRIDE;
   virtual bool CanExecuteScriptOnPage() OVERRIDE;
-  virtual extensions::ScriptExecutor* GetScriptExecutor() OVERRIDE;
+  // Guarded by a process ID check.
+  virtual extensions::ScriptExecutor* GetScriptExecutor() OVERRIDE FINAL;
   virtual bool IsWebView() const OVERRIDE;
 
  private:
@@ -92,7 +114,7 @@ class WebviewInsertCSSFunction : public WebviewExecuteCodeFunction {
   DISALLOW_COPY_AND_ASSIGN(WebviewInsertCSSFunction);
 };
 
-class WebviewGoFunction : public AsyncExtensionFunction {
+class WebviewGoFunction : public WebviewExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("webview.go", WEBVIEW_GO);
 
@@ -101,14 +123,13 @@ class WebviewGoFunction : public AsyncExtensionFunction {
  protected:
   virtual ~WebviewGoFunction();
 
-  // ExtensionFunction implementation.
-  virtual bool RunImpl() OVERRIDE;
-
  private:
+  virtual bool RunImplSafe(WebViewGuest* guest);
+
   DISALLOW_COPY_AND_ASSIGN(WebviewGoFunction);
 };
 
-class WebviewReloadFunction : public AsyncExtensionFunction {
+class WebviewReloadFunction : public WebviewExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("webview.reload", WEBVIEW_RELOAD);
 
@@ -117,14 +138,13 @@ class WebviewReloadFunction : public AsyncExtensionFunction {
  protected:
   virtual ~WebviewReloadFunction();
 
-  // ExtensionFunction implementation.
-  virtual bool RunImpl() OVERRIDE;
-
  private:
+  virtual bool RunImplSafe(WebViewGuest* guest);
+
   DISALLOW_COPY_AND_ASSIGN(WebviewReloadFunction);
 };
 
-class WebviewSetPermissionFunction : public AsyncExtensionFunction {
+class WebviewSetPermissionFunction : public WebviewExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("webview.setPermission", WEBVIEW_SETPERMISSION);
 
@@ -133,14 +153,13 @@ class WebviewSetPermissionFunction : public AsyncExtensionFunction {
  protected:
   virtual ~WebviewSetPermissionFunction();
 
-  // ExtensionFunction implementation.
-  virtual bool RunImpl() OVERRIDE;
-
  private:
+  virtual bool RunImplSafe(WebViewGuest* guest);
+
   DISALLOW_COPY_AND_ASSIGN(WebviewSetPermissionFunction);
 };
 
-class WebviewStopFunction : public AsyncExtensionFunction {
+class WebviewStopFunction : public WebviewExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("webview.stop", WEBVIEW_STOP);
 
@@ -149,14 +168,13 @@ class WebviewStopFunction : public AsyncExtensionFunction {
  protected:
   virtual ~WebviewStopFunction();
 
-  // ExtensionFunction implementation.
-  virtual bool RunImpl() OVERRIDE;
-
  private:
+  virtual bool RunImplSafe(WebViewGuest* guest);
+
   DISALLOW_COPY_AND_ASSIGN(WebviewStopFunction);
 };
 
-class WebviewTerminateFunction : public AsyncExtensionFunction {
+class WebviewTerminateFunction : public WebviewExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("webview.terminate", WEBVIEW_TERMINATE);
 
@@ -165,10 +183,9 @@ class WebviewTerminateFunction : public AsyncExtensionFunction {
  protected:
   virtual ~WebviewTerminateFunction();
 
-  // ExtensionFunction implementation.
-  virtual bool RunImpl() OVERRIDE;
-
  private:
+  virtual bool RunImplSafe(WebViewGuest* guest);
+
   DISALLOW_COPY_AND_ASSIGN(WebviewTerminateFunction);
 };