Refactor PluginPermissionHelper as WebViewPermissionHelper

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

Index: chrome/browser/extensions/api/webview/webview_api.cc
diff --git a/chrome/browser/extensions/api/webview/webview_api.cc b/chrome/browser/extensions/api/webview/webview_api.cc
index 1f1f626b0e0fd45d82327b9f016e90257c1f9b70..5de7b15c8529dee23cb02be451e55638116a5e79 100644
--- a/chrome/browser/extensions/api/webview/webview_api.cc
+++ b/chrome/browser/extensions/api/webview/webview_api.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/extensions/api/context_menus/context_menus_api.h"
 #include "chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h"
 #include "chrome/browser/extensions/tab_helper.h"
+#include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/webview.h"
 #include "content/public/browser/render_process_host.h"
@@ -503,13 +504,14 @@ bool WebviewSetPermissionFunction::RunAsyncSafe(WebViewGuest* guest) {
       webview::SetPermission::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  WebViewGuest::PermissionResponseAction action = WebViewGuest::DEFAULT;
+  WebViewPermissionHelper::PermissionResponseAction action =
+      WebViewPermissionHelper::DEFAULT;
   switch (params->action) {
     case Params::ACTION_ALLOW:
-      action = WebViewGuest::ALLOW;
+      action = WebViewPermissionHelper::ALLOW;
       break;
     case Params::ACTION_DENY:
-      action = WebViewGuest::DENY;
+      action = WebViewPermissionHelper::DENY;
       break;
     case Params::ACTION_DEFAULT:
       break;
@@ -521,13 +523,14 @@ bool WebviewSetPermissionFunction::RunAsyncSafe(WebViewGuest* guest) {
   if (params->user_input)
     user_input = *params->user_input;
 
-  WebViewGuest::SetPermissionResult result =
+  WebViewPermissionHelper::SetPermissionResult result =
       guest->SetPermission(params->request_id, action, user_input);
 
-  EXTENSION_FUNCTION_VALIDATE(result != WebViewGuest::SET_PERMISSION_INVALID);
+  EXTENSION_FUNCTION_VALIDATE(result !=
+                              WebViewPermissionHelper::SET_PERMISSION_INVALID);

[Fady Samuel, 2014/06/20 22:54:33]

This is more readable:

EXTENSION_FUNCTION_VALIDATE(
    result != WebViewPermissionHelper::SET_PERMISSION_INVALID);

[Xi Han, 2014/06/24 13:55:32]

Done.

 
   SetResult(base::Value::CreateBooleanValue(
-      result == WebViewGuest::SET_PERMISSION_ALLOWED));
+      result == WebViewPermissionHelper::SET_PERMISSION_ALLOWED));
   SendResponse(true);
   return true;
 }