content: ResourceType cleanup.

extensions/browser/extension_protocols_unittest.cc

 // Copyright 2014 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 <string>
 
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 102 matching lines @@
     net::URLRequestContext* request_context =
         resource_context_.GetRequestContext();
     job_factory_.SetProtocolHandler(
         kExtensionScheme,
         CreateExtensionProtocolHandler(is_incognito,
                                        extension_info_map_.get()));
     request_context->set_job_factory(&job_factory_);
   }
 
   void StartRequest(net::URLRequest* request,
-                    ResourceType::Type resource_type) {
+                    ResourceType resource_type) {
     content::ResourceRequestInfo::AllocateForTesting(request,
                                                      resource_type,
                                                      &resource_context_,
                                                      -1,
                                                      -1,
                                                      -1,
                                                      false);
     request->Start();
     base::MessageLoop::current()->Run();
   }
@@ skipping 40 matching lines @@
 
     // First test a main frame request.
     {
       // It doesn't matter that the resource doesn't exist. If the resource
       // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request
       // should just fail because the file doesn't exist.
       net::URLRequest request(extension->GetResourceURL("404.html"),
                               net::DEFAULT_PRIORITY,
                               &test_delegate_,
                               resource_context_.GetRequestContext());
-      StartRequest(&request, ResourceType::MAIN_FRAME);
+      StartRequest(&request, content::RESOURCE_TYPE_MAIN_FRAME);
       EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
 
       if (cases[i].should_allow_main_frame_load) {
         EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
             cases[i].name;
       } else {
         EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
             cases[i].name;
       }
     }
 
     // Now do a subframe request.
     {
       net::URLRequest request(extension->GetResourceURL("404.html"),
                               net::DEFAULT_PRIORITY,
                               &test_delegate_,
                               resource_context_.GetRequestContext());
-      StartRequest(&request, ResourceType::SUB_FRAME);
+      StartRequest(&request, content::RESOURCE_TYPE_SUB_FRAME);
       EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
 
       if (cases[i].should_allow_sub_frame_load) {
         EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
             cases[i].name;
       } else {
         EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
             cases[i].name;
       }
     }
@@ skipping 21 matching lines @@
                                     base::Time::Now(),
                                     false,
                                     false);
 
   // First test it with the extension enabled.
   {
     net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
                             net::DEFAULT_PRIORITY,
                             &test_delegate_,
                             resource_context_.GetRequestContext());
-    StartRequest(&request, ResourceType::MEDIA);
+    StartRequest(&request, content::RESOURCE_TYPE_MEDIA);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
     CheckForContentLengthHeader(&request);
   }
 
   // And then test it with the extension disabled.
   extension_info_map_->RemoveExtension(extension->id(),
                                        UnloadedExtensionInfo::REASON_DISABLE);
   {
     net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
                             net::DEFAULT_PRIORITY,
                             &test_delegate_,
                             resource_context_.GetRequestContext());
-    StartRequest(&request, ResourceType::MEDIA);
+    StartRequest(&request, content::RESOURCE_TYPE_MEDIA);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
     CheckForContentLengthHeader(&request);
   }
 }
 
 // Tests that a URL request for resource from an extension returns a few
 // expected response headers.
 TEST_F(ExtensionProtocolTest, ResourceRequestResponseHeaders) {
   // Register a non-incognito extension protocol handler.
   SetProtocolHandler(false);
 
   scoped_refptr<Extension> extension = CreateTestResponseHeaderExtension();
   extension_info_map_->AddExtension(extension.get(),
                                     base::Time::Now(),
                                     false,
                                     false);
 
   {
     net::URLRequest request(extension->GetResourceURL("test.dat"),
                             net::DEFAULT_PRIORITY,
                             &test_delegate_,
                             resource_context_.GetRequestContext());
-    StartRequest(&request, ResourceType::MEDIA);
+    StartRequest(&request, content::RESOURCE_TYPE_MEDIA);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
 
     // Check that cache-related headers are set.
     std::string etag;
     request.GetResponseHeaderByName("ETag", &etag);
     EXPECT_TRUE(StartsWithASCII(etag, "\"", false));
     EXPECT_TRUE(EndsWith(etag, "\"", false));
 
     std::string revalidation_header;
     request.GetResponseHeaderByName("cache-control", &revalidation_header);
@@ skipping 18 matching lines @@
                                     base::Time::Now(),
                                     false,
                                     false);
 
   // All MAIN_FRAME and SUB_FRAME requests should succeed.
   {
     net::URLRequest request(extension->GetResourceURL("test.dat"),
                             net::DEFAULT_PRIORITY,
                             &test_delegate_,
                             resource_context_.GetRequestContext());
-    StartRequest(&request, ResourceType::MAIN_FRAME);
+    StartRequest(&request, content::RESOURCE_TYPE_MAIN_FRAME);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
   }
   {
     net::URLRequest request(extension->GetResourceURL("test.dat"),
                             net::DEFAULT_PRIORITY,
                             &test_delegate_,
                             resource_context_.GetRequestContext());
-    StartRequest(&request, ResourceType::SUB_FRAME);
+    StartRequest(&request, content::RESOURCE_TYPE_SUB_FRAME);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
   }
 
   // And subresource types, such as media, should fail.
   {
     net::URLRequest request(extension->GetResourceURL("test.dat"),
                             net::DEFAULT_PRIORITY,
                             &test_delegate_,
                             resource_context_.GetRequestContext());
-    StartRequest(&request, ResourceType::MEDIA);
+    StartRequest(&request, content::RESOURCE_TYPE_MEDIA);
     EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
   }
 }
 
 }  // namespace extensions