Revert revision 176015

chrome/browser/extensions/api/permissions/permissions_api.cc

 // Copyright (c) 2012 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/permissions/permissions_api.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
@@ skipping 34 matching lines @@
 enum AutoConfirmForTest {
   DO_NOT_SKIP = 0,
   PROCEED,
   ABORT
 };
 AutoConfirmForTest auto_confirm_for_tests = DO_NOT_SKIP;
 bool ignore_user_gesture_for_tests = false;
 
 }  // namespace
 
-bool PermissionsContainsFunction::RunImpl() {
+bool ContainsPermissionsFunction::RunImpl() {
   scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_));
 
   scoped_refptr<PermissionSet> permissions =
       helpers::UnpackPermissionSet(params->permissions, &error_);
   if (!permissions.get())
     return false;
 
   results_ = Contains::Results::Create(
       GetExtension()->GetActivePermissions()->Contains(*permissions));
   return true;
 }
 
-bool PermissionsGetAllFunction::RunImpl() {
+bool GetAllPermissionsFunction::RunImpl() {
   scoped_ptr<Permissions> permissions =
       helpers::PackPermissionSet(GetExtension()->GetActivePermissions());
   results_ = GetAll::Results::Create(*permissions);
   return true;
 }
 
-bool PermissionsRemoveFunction::RunImpl() {
+bool RemovePermissionsFunction::RunImpl() {
   scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   scoped_refptr<PermissionSet> permissions =
       helpers::UnpackPermissionSet(params->permissions, &error_);
   if (!permissions.get())
     return false;
 
   const extensions::Extension* extension = GetExtension();
 
@@ skipping 17 matching lines @@
     results_ = Remove::Results::Create(false);
     return false;
   }
 
   PermissionsUpdater(profile()).RemovePermissions(extension, permissions.get());
   results_ = Remove::Results::Create(true);
   return true;
 }
 
 // static
-void PermissionsRequestFunction::SetAutoConfirmForTests(bool should_proceed) {
+void RequestPermissionsFunction::SetAutoConfirmForTests(bool should_proceed) {
   auto_confirm_for_tests = should_proceed ? PROCEED : ABORT;
 }
 
 // static
-void PermissionsRequestFunction::SetIgnoreUserGestureForTests(
+void RequestPermissionsFunction::SetIgnoreUserGestureForTests(
     bool ignore) {
   ignore_user_gesture_for_tests = ignore;
 }
 
-PermissionsRequestFunction::PermissionsRequestFunction() {}
+RequestPermissionsFunction::RequestPermissionsFunction() {}
 
-void PermissionsRequestFunction::InstallUIProceed() {
+void RequestPermissionsFunction::InstallUIProceed() {
   PermissionsUpdater perms_updater(profile());
   perms_updater.AddPermissions(GetExtension(), requested_permissions_.get());
 
   results_ = Request::Results::Create(true);
   SendResponse(true);
 
   Release();  // Balanced in RunImpl().
 }
 
-void PermissionsRequestFunction::InstallUIAbort(bool user_initiated) {
+void RequestPermissionsFunction::InstallUIAbort(bool user_initiated) {
   results_ = Request::Results::Create(false);
   SendResponse(true);
 
   Release();  // Balanced in RunImpl().
 }
 
-PermissionsRequestFunction::~PermissionsRequestFunction() {}
+RequestPermissionsFunction::~RequestPermissionsFunction() {}
 
-bool PermissionsRequestFunction::RunImpl() {
+bool RequestPermissionsFunction::RunImpl() {
   if (!user_gesture() && !ignore_user_gesture_for_tests) {
     error_ = kUserGestureRequiredError;
     return false;
   }
 
   scoped_ptr<Request::Params> params(Request::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   requested_permissions_ =
       helpers::UnpackPermissionSet(params->permissions, &error_);
@@ skipping 59 matching lines @@
     InstallUIAbort(true);
   } else {
     CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests);
     install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents()));
     install_ui_->ConfirmPermissions(
         this, GetExtension(), requested_permissions_.get());
   }
 
   return true;
 }