Cleanup webRequest/Internal API and permission registration.

chrome/browser/extensions/api/web_request/web_request_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/web_request/web_request_api.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 2131 matching lines @@
   // We only check whether tokens are left here. Deducting a token happens in
   // OnPageLoad().
   return bucket->has_tokens();
 }
 
 void ClearCacheQuotaHeuristic::OnPageLoad(Bucket* bucket) {
   callback_registered_ = false;
   bucket->DeductToken();
 }
 
-bool WebRequestAddEventListener::RunImpl() {
+bool WebRequestInternalAddEventListenerFunction::RunImpl() {
   // Argument 0 is the callback, which we don't use here.
   ExtensionWebRequestEventRouter::RequestFilter filter;
   base::DictionaryValue* value = NULL;
   error_.clear();
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &value));
   // Failure + an empty error string means a fatal error.
   EXTENSION_FUNCTION_VALIDATE(filter.InitFromValue(*value, &error_) ||
                               !error_.empty());
   if (!error_.empty())
     return false;
@@ skipping 59 matching lines @@
 
   helpers::ClearCacheOnNavigation();
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &helpers::NotifyWebRequestAPIUsed,
       profile_id(), make_scoped_refptr(GetExtension())));
 
   return true;
 }
 
-void WebRequestEventHandled::RespondWithError(
+void WebRequestInternalEventHandledFunction::RespondWithError(
     const std::string& event_name,
     const std::string& sub_event_name,
     uint64 request_id,
     scoped_ptr<ExtensionWebRequestEventRouter::EventResponse> response,
     const std::string& error) {
   error_ = error;
   ExtensionWebRequestEventRouter::GetInstance()->OnEventHandled(
       profile_id(),
       extension_id(),
       event_name,
       sub_event_name,
       request_id,
       response.release());
 }
 
-bool WebRequestEventHandled::RunImpl() {
+bool WebRequestInternalEventHandledFunction::RunImpl() {
   std::string event_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &event_name));
 
   std::string sub_event_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &sub_event_name));
 
   std::string request_id_str;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(2, &request_id_str));
   uint64 request_id;
   EXTENSION_FUNCTION_VALIDATE(base::StringToUint64(request_id_str,
@@ skipping 191 matching lines @@
       } else if ((*it)->name().find("AdBlock") != std::string::npos) {
         adblock = true;
       } else {
         other = true;
       }
     }
   }
 
   host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
 }