content: ResourceType cleanup.

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/message_loop.h"
 #include "base/test/values_test_util.h"
@@ skipping 67 matching lines @@
 
   net::TestURLRequestContext context;
   const GURL http_url("http://www.example.com");
   net::TestURLRequest match_request(
       http_url, net::DEFAULT_PRIORITY, NULL, &context);
   WebRequestData data(&match_request, ON_BEFORE_REQUEST);
   WebRequestDataWithMatchIds request_data(&data);
   request_data.url_match_ids = matcher.MatchURL(http_url);
   EXPECT_EQ(1u, request_data.url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(
-      &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, -1, false);
+      &match_request,
+      content::RESOURCE_TYPE_MAIN_FRAME,
+      NULL,
+      -1,
+      -1,
+      -1,
+      false);
   EXPECT_TRUE(result->IsFulfilled(request_data));
 
   const GURL https_url("https://www.example.com");
   net::TestURLRequest wrong_resource_type(
       https_url, net::DEFAULT_PRIORITY, NULL, &context);
   data.request = &wrong_resource_type;
   request_data.url_match_ids = matcher.MatchURL(http_url);
   // Make sure IsFulfilled does not fail because of URL matching.
   EXPECT_EQ(1u, request_data.url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(
-      &wrong_resource_type, ResourceType::SUB_FRAME, NULL, -1, -1, -1, false);
+      &wrong_resource_type,
+      content::RESOURCE_TYPE_SUB_FRAME,
+      NULL,
+      -1,
+      -1,
+      -1,
+      false);
   EXPECT_FALSE(result->IsFulfilled(request_data));
 }
 
 TEST(WebRequestConditionTest, CreateConditionFirstPartyForCookies) {
   // Necessary for TestURLRequest.
   base::MessageLoopForIO message_loop;
   URLMatcher matcher;
 
   std::string error;
   scoped_ptr<WebRequestCondition> result;
@@ skipping 19 matching lines @@
   const GURL first_party_url("http://fpfc.example.com");
   net::TestURLRequest match_request(
       http_url, net::DEFAULT_PRIORITY, NULL, &context);
   WebRequestData data(&match_request, ON_BEFORE_REQUEST);
   WebRequestDataWithMatchIds request_data(&data);
   request_data.url_match_ids = matcher.MatchURL(http_url);
   EXPECT_EQ(0u, request_data.url_match_ids.size());
   request_data.first_party_url_match_ids = matcher.MatchURL(first_party_url);
   EXPECT_EQ(1u, request_data.first_party_url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(
-      &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, -1, false);
+      &match_request,
+      content::RESOURCE_TYPE_MAIN_FRAME,
+      NULL,
+      -1,
+      -1,
+      -1,
+      false);
   EXPECT_TRUE(result->IsFulfilled(request_data));
 }
 
 // Conditions without UrlFilter attributes need to be independent of URL
 // matching results. We test here that:
 //   1. A non-empty condition without UrlFilter attributes is fulfilled iff its
 //      attributes are fulfilled.
 //   2. An empty condition (in particular, without UrlFilter attributes) is
 //      always fulfilled.
 TEST(WebRequestConditionTest, NoUrlAttributes) {
@@ skipping 218 matching lines @@
            // filters.
            "  \"requestHeaders\": [{}], \n"
            "  \"responseHeaders\": [{}], \n"
            "}"),
       &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 }
 
 }  // namespace extensions