Revert revision 176015

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 1688 matching lines @@
 }
 
 void ExtensionWebRequestEventRouter::ClearSignaled(uint64 request_id,
                                                    EventTypes event_type) {
   SignaledRequestMap::iterator iter = signaled_requests_.find(request_id);
   if (iter == signaled_requests_.end())
     return;
   iter->second &= ~event_type;
 }
 
-// Special QuotaLimitHeuristic for WebRequestHandlerBehaviorChangedFunction.
+// Special QuotaLimitHeuristic for WebRequestHandlerBehaviorChanged.
 //
 // Each call of webRequest.handlerBehaviorChanged() clears the in-memory cache
 // of WebKit at the time of the next page load (top level navigation event).
 // This quota heuristic is intended to limit the number of times the cache is
 // cleared by an extension.
 //
 // As we want to account for the number of times the cache is really cleared
 // (opposed to the number of times webRequest.handlerBehaviorChanged() is
 // called), we cannot decide whether a call of
 // webRequest.handlerBehaviorChanged() should trigger a quota violation at the
@@ skipping 228 matching lines @@
     }
   }
 
   ExtensionWebRequestEventRouter::GetInstance()->OnEventHandled(
       profile_id(), extension_id(), event_name, sub_event_name, request_id,
       response.release());
 
   return true;
 }
 
-void WebRequestHandlerBehaviorChangedFunction::GetQuotaLimitHeuristics(
+void WebRequestHandlerBehaviorChanged::GetQuotaLimitHeuristics(
     QuotaLimitHeuristics* heuristics) const {
   QuotaLimitHeuristic::Config config = {
     // See web_request.json for current value.
     web_request::MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES,
     base::TimeDelta::FromMinutes(10)
   };
   QuotaLimitHeuristic::BucketMapper* bucket_mapper =
       new QuotaLimitHeuristic::SingletonBucketMapper();
   ClearCacheQuotaHeuristic* heuristic =
       new ClearCacheQuotaHeuristic(config, bucket_mapper);
   heuristics->push_back(heuristic);
 }
 
-void WebRequestHandlerBehaviorChangedFunction::OnQuotaExceeded(
+void WebRequestHandlerBehaviorChanged::OnQuotaExceeded(
     const std::string& violation_error) {
   // Post warning message.
   ExtensionWarningSet warnings;
   warnings.insert(
       ExtensionWarning::CreateRepeatedCacheFlushesWarning(extension_id()));
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&ExtensionWarningService::NotifyWarningsOnUI,
                  profile_id(), warnings));
 
   // Continue gracefully.
   Run();
 }
 
-bool WebRequestHandlerBehaviorChangedFunction::RunImpl() {
+bool WebRequestHandlerBehaviorChanged::RunImpl() {
   helpers::ClearCacheOnNavigation();
   return true;
 }
 
 void SendExtensionWebRequestStatusToHost(content::RenderProcessHost* host) {
   Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
   if (!profile || !profile->GetExtensionService())
     return;
 
   bool adblock = false;
   bool adblock_plus = false;
   bool other = false;
   const ExtensionSet* extensions =
       profile->GetExtensionService()->extensions();
   for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     if (profile->GetExtensionService()->HasUsedWebRequest(*it)) {
       if ((*it)->name().find("Adblock Plus") != std::string::npos) {
         adblock_plus = true;
       } else if ((*it)->name().find("AdBlock") != std::string::npos) {
         adblock = true;
       } else {
         other = true;
       }
     }
   }
 
   host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
 }