Make URL filter for web request API mandatory

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 394 matching lines @@
         num_handlers_blocking(0),
         net_log(NULL),
         new_url(NULL),
         request_headers(NULL),
         override_response_headers(NULL),
         auth_credentials(NULL) {}
 };
 
 bool ExtensionWebRequestEventRouter::RequestFilter::InitFromValue(
     const DictionaryValue& value, std::string* error) {
+  if (!value.HasKey("urls"))
+    return false;
+
   for (DictionaryValue::key_iterator key = value.begin_keys();
        key != value.end_keys(); ++key) {
     if (*key == "urls") {
       ListValue* urls_value = NULL;
       if (!value.GetList("urls", &urls_value))
         return false;
       for (size_t i = 0; i < urls_value->GetSize(); ++i) {
         std::string url;
         URLPattern pattern(URLPattern::SCHEME_ALL);
         if (!urls_value->GetString(i, &url) ||
@@ skipping 1057 matching lines @@
 
 void ClearCacheQuotaHeuristic::OnPageLoad(Bucket* bucket) {
   callback_registered_ = false;
   bucket->DeductToken();
 }
 
 bool WebRequestAddEventListener::RunImpl() {
   // Argument 0 is the callback, which we don't use here.
 
   ExtensionWebRequestEventRouter::RequestFilter filter;
-  if (HasOptionalArgument(1)) {
-    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;
-  }
+  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;
 
   int extra_info_spec = 0;
   if (HasOptionalArgument(2)) {
     ListValue* value = NULL;
     EXTENSION_FUNCTION_VALIDATE(args_->GetList(2, &value));
     EXTENSION_FUNCTION_VALIDATE(
         ExtensionWebRequestEventRouter::ExtraInfoSpec::InitFromValue(
             *value, &extra_info_spec));
   }
 
@@ skipping 195 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));
 }