Rename chrome.experimental.webRequest to chrome.webRequest and chrome.webRequestBlocking

chrome/browser/extensions/extension_webrequest_api.cc

 // Copyright (c) 2011 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/extension_webrequest_api.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
@@ skipping 1459 matching lines @@
   std::string event_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(3, &event_name));
 
   std::string sub_event_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(4, &sub_event_name));
 
   const Extension* extension =
       extension_info_map()->extensions().GetByID(extension_id());
   std::string extension_name = extension ? extension->name() : extension_id();
 
+  // We check automatically whether the extension has the 'webRequest'
+  // permission. For blocking calls we require the additional permission
+  // 'webRequestBlocking'.
+  if ((extra_info_spec &
+          (ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING |
+           ExtensionWebRequestEventRouter::ExtraInfoSpec::ASYNC_BLOCKING)) &&
+       !extension->HasAPIPermission(
+           ExtensionAPIPermission::kWebRequestBlocking)) {
+    error_ = keys::kBlockingPermissionRequired;
+    return false;
+  }
+
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
       profile_id(), extension_id(), extension_name,
       event_name, sub_event_name, filter,
       extra_info_spec, ipc_sender_weak());
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &NotifyWebRequestAPIUsed,
       profile_id(), make_scoped_refptr(GetExtension())));
 
   return true;
@@ skipping 160 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));
 }