Support also excluding content types in declarative webrequest conditions.

BUG=112155

Review URL: https://chromiumcodereview.appspot.com/10825212

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150421 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc

@@ -144,8 +144,10 @@ WebRequestConditionAttributeResourceType::GetType() const {
 
 WebRequestConditionAttributeContentType::
 WebRequestConditionAttributeContentType(
-    const std::vector<std::string>& content_types)
-    : content_types_(content_types) {}
+    const std::vector<std::string>& content_types,
+    bool inclusive)
+    : content_types_(content_types),
+      inclusive_(inclusive) {}
 
 WebRequestConditionAttributeContentType::
 ~WebRequestConditionAttributeContentType() {}
@@ -153,7 +155,8 @@ WebRequestConditionAttributeContentType::
 // static
 bool WebRequestConditionAttributeContentType::IsMatchingType(
     const std::string& instance_type) {
-  return instance_type == keys::kContentTypeKey;
+  return instance_type == keys::kContentTypeKey ||
+      instance_type == keys::kExcludeContentTypeKey;
 }
 
 // static
@@ -162,27 +165,27 @@ WebRequestConditionAttributeContentType::Create(
       const std::string& name,
       const base::Value* value,
       std::string* error) {
-  std::vector<std::string> content_types;
+  DCHECK(IsMatchingType(name));
 
   const ListValue* value_as_list = NULL;
   if (!value->GetAsList(&value_as_list)) {
-    *error = ExtensionErrorUtils::FormatErrorMessage(kInvalidValue,
-                                                     keys::kContentTypeKey);
+    *error = ExtensionErrorUtils::FormatErrorMessage(kInvalidValue, name);
     return scoped_ptr<WebRequestConditionAttribute>(NULL);
   }
-
+  std::vector<std::string> content_types;
   for (ListValue::const_iterator it = value_as_list->begin();
        it != value_as_list->end(); ++it) {
     std::string content_type;
     if (!(*it)->GetAsString(&content_type)) {
-      *error = ExtensionErrorUtils::FormatErrorMessage(kInvalidValue,
-                                                       keys::kContentTypeKey);
+      *error = ExtensionErrorUtils::FormatErrorMessage(kInvalidValue, name);
       return scoped_ptr<WebRequestConditionAttribute>(NULL);
     }
     content_types.push_back(content_type);
   }
+
   return scoped_ptr<WebRequestConditionAttribute>(
-      new WebRequestConditionAttributeContentType(content_types));
+      new WebRequestConditionAttributeContentType(
+          content_types, name == keys::kContentTypeKey));
 }
 
 int WebRequestConditionAttributeContentType::GetStages() const {
@@ -202,8 +205,13 @@ bool WebRequestConditionAttributeContentType::IsFulfilled(
   net::HttpUtil::ParseContentType(
       content_type, &mime_type, &charset, &had_charset, NULL);
 
-  return std::find(content_types_.begin(), content_types_.end(),
-                   mime_type) != content_types_.end();
+  if (inclusive_) {
+    return std::find(content_types_.begin(), content_types_.end(),
+                     mime_type) != content_types_.end();
+  } else {
+    return std::find(content_types_.begin(), content_types_.end(),
+                     mime_type) == content_types_.end();
+  }
 }
 
 WebRequestConditionAttribute::Type

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h

@@ -124,9 +124,11 @@ class WebRequestConditionAttributeContentType
 
  private:
   explicit WebRequestConditionAttributeContentType(
-      const std::vector<std::string>& content_types);
+      const std::vector<std::string>& include_content_types,
+      bool inclusive);
 
   std::vector<std::string> content_types_;
+  bool inclusive_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeContentType);
 };

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc

@@ -62,7 +62,7 @@ TEST(WebRequestConditionAttributeTest, CreateConditionAttribute) {
             result->GetType());
 }
 
-TEST(WebRequestConditionAttributeTest, TestResourceType) {
+TEST(WebRequestConditionAttributeTest, ResourceType) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
 
@@ -91,7 +91,7 @@ TEST(WebRequestConditionAttributeTest, TestResourceType) {
       WebRequestRule::RequestData(&url_request_fail, ON_BEFORE_REQUEST)));
 }
 
-TEST(WebRequestConditionAttributeTest, TestContentType) {
+TEST(WebRequestConditionAttributeTest, ContentType) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
 
@@ -114,28 +114,44 @@ TEST(WebRequestConditionAttributeTest, TestContentType) {
 
   ListValue content_types;
   content_types.Append(Value::CreateStringValue("text/html"));
-  scoped_ptr<WebRequestConditionAttribute> attribute_ok =
+  scoped_ptr<WebRequestConditionAttribute> attribute_include =
       WebRequestConditionAttribute::Create(
           keys::kContentTypeKey, &content_types, &error);
   EXPECT_EQ("", error);
-  ASSERT_TRUE(attribute_ok.get());
-
-  EXPECT_FALSE(attribute_ok->IsFulfilled(
+  ASSERT_TRUE(attribute_include.get());
+  EXPECT_FALSE(attribute_include->IsFulfilled(
       WebRequestRule::RequestData(&url_request, ON_BEFORE_REQUEST,
                                   url_request.response_headers())));
-  EXPECT_TRUE(attribute_ok->IsFulfilled(
+  EXPECT_TRUE(attribute_include->IsFulfilled(
+      WebRequestRule::RequestData(&url_request, ON_HEADERS_RECEIVED,
+                                  url_request.response_headers())));
+
+  scoped_ptr<WebRequestConditionAttribute> attribute_exclude =
+      WebRequestConditionAttribute::Create(
+          keys::kExcludeContentTypeKey, &content_types, &error);
+  EXPECT_EQ("", error);
+  ASSERT_TRUE(attribute_exclude.get());
+  EXPECT_FALSE(attribute_exclude->IsFulfilled(
       WebRequestRule::RequestData(&url_request, ON_HEADERS_RECEIVED,
                                   url_request.response_headers())));
 
   content_types.Clear();
   content_types.Append(Value::CreateStringValue("something/invalid"));
-  scoped_ptr<WebRequestConditionAttribute> attribute_fail =
+  scoped_ptr<WebRequestConditionAttribute> attribute_unincluded =
       WebRequestConditionAttribute::Create(
           keys::kContentTypeKey, &content_types, &error);
   EXPECT_EQ("", error);
-  ASSERT_TRUE(attribute_fail.get());
+  ASSERT_TRUE(attribute_unincluded.get());
+  EXPECT_FALSE(attribute_unincluded->IsFulfilled(
+      WebRequestRule::RequestData(&url_request, ON_HEADERS_RECEIVED,
+                                  url_request.response_headers())));
 
-  EXPECT_FALSE(attribute_fail->IsFulfilled(
+  scoped_ptr<WebRequestConditionAttribute> attribute_unexcluded =
+      WebRequestConditionAttribute::Create(
+          keys::kExcludeContentTypeKey, &content_types, &error);
+  EXPECT_EQ("", error);
+  ASSERT_TRUE(attribute_unexcluded.get());
+  EXPECT_TRUE(attribute_unexcluded->IsFulfilled(
       WebRequestRule::RequestData(&url_request, ON_HEADERS_RECEIVED,
                                   url_request.response_headers())));
 }

chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.cc

@@ -15,6 +15,7 @@ const char kCookieKey[] = "cookie";
 const char kContentTypeKey[] = "contentType";
 const char kDirectionKey[] = "direction";
 const char kDomainKey[] = "domain";
+const char kExcludeContentTypeKey[] = "excludeContentType";
 const char kExpiresKey[] = "expires";
 const char kFilterKey[] ="filter";
 const char kFromKey[] = "from";

chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h

@@ -18,6 +18,7 @@ extern const char kCookieKey[];
 extern const char kContentTypeKey[];
 extern const char kDirectionKey[];
 extern const char kDomainKey[];
+extern const char kExcludeContentTypeKey[];
 extern const char kExpiresKey[];
 extern const char kFilterKey[];
 extern const char kFromKey[];

chrome/common/extensions/api/declarative_web_request.json

@@ -29,6 +29,12 @@
             "description": "Matches if the MIME media type of a response (from the HTTP Content-Type header) is contained in the list.",
             "items": { "type": "string" }
           },
+          "excludeContentType": {
+            "type": "array",
+            "optional": true,
+            "description": "Matches if the MIME media type of a response (from the HTTP Content-Type header) is <em>not</em> contained in the list.",
+            "items": { "type": "string" }
+          },
           "instanceType": {
             "type": "string", "enum": ["declarativeWebRequest.RequestMatcher"],
             "nodoc": true

chrome/common/extensions/docs/extensions/declarativeWebRequest.html

@@ -361,7 +361,7 @@ requests if and only if all listed criteria are met. The following
 </p>
 <pre>var matcher = new chrome.declarativeWebRequest.RequestMatcher({
   url: { hostSuffix: 'example.com', schemes: ['http'] },
-  resourceType: 'main_frame'
+  resourceType: ['main_frame']
   });
 </pre>
 <p>
@@ -803,6 +803,36 @@ very fast URL matching algorithm for hundreds of thousands of URLs.
           <!-- OBJECT METHODS -->
           <!-- OBJECT EVENT FIELDS -->
           <!-- FUNCTION PARAMETERS -->
+        </div>
+              </div><div>
+                <div>
+          <dt>
+            <var>excludeContentType</var>
+              <em>
+                <!-- TYPE -->
+                <div style="display:inline">
+                  (
+                    <span class="optional">optional</span>
+                    <span id="typeTemplate">
+                      <span>
+                        <span>
+                          array of <span><span>
+                      <span>
+                        <span>string</span>
+                      </span>
+                    </span></span>
+                        </span>
+                      </span>
+                    </span>
+                  )
+                </div>
+              </em>
+          </dt>
+          <dd>Matches if the MIME media type of a response (from the HTTP Content-Type header) is <em>not</em> contained in the list.</dd>
+          <!-- OBJECT PROPERTIES -->
+          <!-- OBJECT METHODS -->
+          <!-- OBJECT EVENT FIELDS -->
+          <!-- FUNCTION PARAMETERS -->
         </div>
               </div>
             </dl>

chrome/common/extensions/docs/samples.json

@@ -177,6 +177,14 @@
     "chrome.experimental.processes.terminate": "experimental.processes.html#method-terminate",
     "chrome.experimental.record.captureURLs": "experimental.record.html#method-captureURLs",
     "chrome.experimental.record.replayURLs": "experimental.record.html#method-replayURLs",
+    "chrome.experimental.serial.close": "experimental.serial.html#method-close",
+    "chrome.experimental.serial.flush": "experimental.serial.html#method-flush",
+    "chrome.experimental.serial.getControlSignals": "experimental.serial.html#method-getControlSignals",
+    "chrome.experimental.serial.getPorts": "experimental.serial.html#method-getPorts",
+    "chrome.experimental.serial.open": "experimental.serial.html#method-open",
+    "chrome.experimental.serial.read": "experimental.serial.html#method-read",
+    "chrome.experimental.serial.setControlSignals": "experimental.serial.html#method-setControlSignals",
+    "chrome.experimental.serial.write": "experimental.serial.html#method-write",
     "chrome.experimental.speechInput.isRecording": "experimental.speechInput.html#method-isRecording",
     "chrome.experimental.speechInput.onError": "experimental.speechInput.html#event-onError",
     "chrome.experimental.speechInput.onResult": "experimental.speechInput.html#event-onResult",

chrome/common/extensions/docs/static/declarativeWebRequest.html

@@ -49,7 +49,7 @@ requests if and only if all listed criteria are met. The following
 <pre>
 var matcher = new chrome.declarativeWebRequest.RequestMatcher({
   url: { hostSuffix: 'example.com', schemes: ['http'] },
-  resourceType: 'main_frame'
+  resourceType: ['main_frame']
   });
 </pre>
 

chrome/test/data/extensions/api_test/webrequest/test_declarative.js

@@ -104,7 +104,8 @@ runTests([
                  'schemes': ["http"]
              },
              'resourceType': ["main_frame"],
-             'contentType': ["text/html"]})],
+             'contentType': ["text/html"],
+             'excludeContentType': ["image/png"]})],
          'actions': [new CancelRequest()]}
       ],
       function() {navigateAndWait(getURLHttpWithHeaders());}