Refactor PluginPermissionHelper as WebViewPermissionHelper

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

 // Copyright (c) 2013 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 "chrome/browser/extensions/api/webview/webview_api.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 #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"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/stop_find_action.h"
 #include "extensions/common/error_utils.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 
@@ skipping 474 matching lines @@
 }
 
 WebviewSetPermissionFunction::~WebviewSetPermissionFunction() {
 }
 
 bool WebviewSetPermissionFunction::RunAsyncSafe(WebViewGuest* guest) {
   scoped_ptr<webview::SetPermission::Params> params(
       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;
     default:
       NOTREACHED();
   }
 
   std::string user_input;
   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;
 }
 
 WebviewShowContextMenuFunction::WebviewShowContextMenuFunction() {
 }
 
 WebviewShowContextMenuFunction::~WebviewShowContextMenuFunction() {
 }
 
@@ skipping 41 matching lines @@
 
 WebviewTerminateFunction::~WebviewTerminateFunction() {
 }
 
 bool WebviewTerminateFunction::RunAsyncSafe(WebViewGuest* guest) {
   guest->Terminate();
   return true;
 }
 
 }  // namespace extensions