Implemented proper support for checking schemes and requested resource types.

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.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/declarative_webrequest/webrequest_condition.h"
 
 #include <set>
 
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
+#include "content/public/browser/resource_request_info.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace keys = declarative_webrequest_constants;
 
 TEST(WebRequestConditionTest, CreateCondition) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
   std::string error;
   scoped_ptr<WebRequestCondition> result;
 
   DictionaryValue invalid_condition;
   invalid_condition.SetString("invalid", "foobar");
   invalid_condition.SetString("host_suffix", "example.com");
   invalid_condition.SetString(keys::kInstanceTypeKey,
                               keys::kRequestMatcherType);
 
   DictionaryValue invalid_condition2;
   invalid_condition2.Set("host_suffix", new ListValue);
   invalid_condition2.SetString(keys::kInstanceTypeKey,
                                keys::kRequestMatcherType);
 
+  ListValue* resource_type_list = new ListValue();
+  resource_type_list->Append(Value::CreateStringValue("main_frame"));
   DictionaryValue valid_condition;
-  valid_condition.SetString("scheme", "http");
+  valid_condition.Set(keys::kResourceTypeKey, resource_type_list);
   valid_condition.SetString("host_suffix", "example.com");
   valid_condition.SetString(keys::kInstanceTypeKey,
                             keys::kRequestMatcherType);
 
   // Test wrong condition name passed.
   error.clear();
   result = WebRequestCondition::Create(matcher.condition_factory(),
                                        invalid_condition, &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 
   // Test wrong datatype in host_suffix.
   error.clear();
   result = WebRequestCondition::Create(matcher.condition_factory(),
                                        invalid_condition2, &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 
   // Test success (can we support multiple criteria?)
   error.clear();
   result = WebRequestCondition::Create(matcher.condition_factory(),
                                        valid_condition, &error);
-  EXPECT_TRUE(error.empty());
+  EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
 
   TestURLRequest match_request(GURL("http://www.example.com"), NULL);
+  content::ResourceRequestInfo::AllocateForTesting(&match_request,
+      ResourceType::MAIN_FRAME, NULL);
   EXPECT_TRUE(result->IsFulfilled(&match_request, ON_BEFORE_REQUEST));
 
-  TestURLRequest wrong_scheme(GURL("https://www.example.com"), NULL);
-  EXPECT_FALSE(result->IsFulfilled(&wrong_scheme, ON_BEFORE_REQUEST));
+  TestURLRequest wrong_resource_type(GURL("https://www.example.com"), NULL);
+  content::ResourceRequestInfo::AllocateForTesting(&wrong_resource_type,
+      ResourceType::SUB_FRAME, NULL);
+  EXPECT_FALSE(result->IsFulfilled(&wrong_resource_type, ON_BEFORE_REQUEST));
 }
 
 TEST(WebRequestConditionTest, CreateConditionSet) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
+  ListValue* http_scheme_list = new ListValue();
+  http_scheme_list->Append(Value::CreateStringValue("http"));
   DictionaryValue http_condition;
-  http_condition.SetString("scheme", "http");
+  http_condition.Set(keys::kSchemesKey, http_scheme_list);
   http_condition.SetString("host_suffix", "example.com");
   http_condition.SetString(keys::kInstanceTypeKey, keys::kRequestMatcherType);
 
+  ListValue* https_scheme_list = new ListValue();
+  https_scheme_list->Append(Value::CreateStringValue("https"));
   DictionaryValue https_condition;
-  https_condition.SetString("scheme", "https");
+  https_condition.Set(keys::kSchemesKey, https_scheme_list);
   https_condition.SetString("host_suffix", "example.com");
   https_condition.SetString("host_prefix", "www");
   https_condition.SetString(keys::kInstanceTypeKey, keys::kRequestMatcherType);
 
   WebRequestConditionSet::AnyVector conditions;
 
   linked_ptr<json_schema_compiler::any::Any> condition1 = make_linked_ptr(
       new json_schema_compiler::any::Any);
   condition1->Init(http_condition);
   conditions.push_back(condition1);
 
   linked_ptr<json_schema_compiler::any::Any> condition2 = make_linked_ptr(
       new json_schema_compiler::any::Any);
   condition2->Init(https_condition);
   conditions.push_back(condition2);
 
   // Test insertion
   std::string error;
   scoped_ptr<WebRequestConditionSet> result =
       WebRequestConditionSet::Create(matcher.condition_factory(),
                                      conditions, &error);
-  EXPECT_TRUE(error.empty());
+  EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
   EXPECT_EQ(2u, result->conditions().size());
 
   // Tell the URLMatcher about our shiny new patterns.
   URLMatcherConditionSet::Vector url_matcher_condition_set;
   result->GetURLMatcherConditionSets(&url_matcher_condition_set);
   matcher.AddConditionSets(url_matcher_condition_set);
 
   std::set<URLMatcherConditionSet::ID> url_match_ids;
   int number_matches = 0;
@@ skipping 28 matching lines @@
   number_matches = 0;
   for (std::set<URLMatcherConditionSet::ID>::iterator i = url_match_ids.begin();
        i != url_match_ids.end(); ++i) {
     if (result->IsFulfilled(*i, &https_foo_request, ON_BEFORE_REQUEST))
       ++number_matches;
   }
   EXPECT_EQ(0, number_matches);
 }
 
 }  // namespace extensions