Revert 232802 "[Net] Assert that URLRequests with LOAD_IGNORE_LI..."

trunk/src/net/url_request/url_request_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 1878 matching lines @@
 
   req.SetPriority(LOW);
   req.Start();
   EXPECT_EQ(LOW, job->priority());
 
   req.SetPriority(MEDIUM);
   EXPECT_EQ(MEDIUM, req.priority());
   EXPECT_EQ(MEDIUM, job->priority());
 }
 
-// Setting the IGNORE_LIMITS load flag should be okay if the priority
-// is MAXIMUM_PRIORITY.
-TEST_F(URLRequestTest, PriorityIgnoreLimits) {
-  TestDelegate d;
-  URLRequest req(GURL("http://test_intercept/foo"),
-                 MAXIMUM_PRIORITY,
-                 &d,
-                 &default_context_);
-  EXPECT_EQ(MAXIMUM_PRIORITY, req.priority());
-
-  scoped_refptr<URLRequestTestJob> job =
-      new URLRequestTestJob(&req, &default_network_delegate_);
-  AddTestInterceptor()->set_main_intercept_job(job.get());
-
-  req.SetLoadFlags(LOAD_IGNORE_LIMITS);
-  EXPECT_EQ(MAXIMUM_PRIORITY, req.priority());
-
-  req.SetPriority(MAXIMUM_PRIORITY);
-  EXPECT_EQ(MAXIMUM_PRIORITY, req.priority());
-
-  req.Start();
-  EXPECT_EQ(MAXIMUM_PRIORITY, req.priority());
-  EXPECT_EQ(MAXIMUM_PRIORITY, job->priority());
-}
-
 // TODO(droger): Support SpawnedTestServer on iOS (see http://crbug.com/148666).
 #if !defined(OS_IOS)
 // A subclass of SpawnedTestServer that uses a statically-configured hostname.
 // This is to work around mysterious failures in chrome_frame_net_tests. See:
 // http://crbug.com/114369
 class LocalHttpTestServer : public SpawnedTestServer {
  public:
   explicit LocalHttpTestServer(const base::FilePath& document_root)
       : SpawnedTestServer(SpawnedTestServer::TYPE_HTTP,
                           ScopedCustomUrlRequestTestHttpHost::value(),
@@ skipping 88 matching lines @@
 
   // Verify that the cookie isn't sent when LOAD_DO_NOT_SEND_COOKIES is set.
   {
     TestNetworkDelegate network_delegate;
     default_context_.set_network_delegate(&network_delegate);
     TestDelegate d;
     URLRequest req(test_server.GetURL("echoheader?Cookie"),
                    DEFAULT_PRIORITY,
                    &d,
                    &default_context_);
-    req.SetLoadFlags(LOAD_DO_NOT_SEND_COOKIES);
+    req.set_load_flags(LOAD_DO_NOT_SEND_COOKIES);
     req.Start();
     base::RunLoop().Run();
 
     EXPECT_TRUE(d.data_received().find("Cookie: CookieToNotSend=1")
                 == std::string::npos);
 
     // LOAD_DO_NOT_SEND_COOKIES does not trigger OnGetCookies.
     EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
     EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
   }
@@ skipping 23 matching lines @@
   // Try to set-up another cookie and update the previous cookie.
   {
     TestNetworkDelegate network_delegate;
     default_context_.set_network_delegate(&network_delegate);
     TestDelegate d;
     URLRequest req(
         test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"),
         DEFAULT_PRIORITY,
         &d,
         &default_context_);
-    req.SetLoadFlags(LOAD_DO_NOT_SAVE_COOKIES);
+    req.set_load_flags(LOAD_DO_NOT_SAVE_COOKIES);
     req.Start();
 
     base::RunLoop().Run();
 
     // LOAD_DO_NOT_SAVE_COOKIES does not trigger OnSetCookie.
     EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
     EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
     EXPECT_EQ(0, network_delegate.set_cookie_count());
   }
 
@@ skipping 421 matching lines @@
   {
     TestDelegate d;
     URLRequest req(test_server.GetURL("echoheader?Referer"),
                    DEFAULT_PRIORITY,
                    &d,
                    &default_context_);
 
     HttpRequestHeaders headers;
     headers.SetHeader(HttpRequestHeaders::kReferer, "http://bar.com/");
     req.SetExtraRequestHeaders(headers);
-    req.SetLoadFlags(LOAD_VALIDATE_CACHE);
+    req.set_load_flags(LOAD_VALIDATE_CACHE);
 
     req.Start();
     base::RunLoop().Run();
 
     EXPECT_EQ("None", d.data_received());
   }
 }
 
 class URLRequestTestHTTP : public URLRequestTest {
  public:
@@ skipping 2790 matching lines @@
   // cachable page, we expect this test to result in a 304.  in which case, the
   // response should be fetched from the cache.
   {
     TestDelegate d;
     d.set_credentials(AuthCredentials(kUser, kSecret));
 
     URLRequest r(test_server_.GetURL("auth-basic"),
                  DEFAULT_PRIORITY,
                  &d,
                  &default_context_);
-    r.SetLoadFlags(LOAD_VALIDATE_CACHE);
+    r.set_load_flags(LOAD_VALIDATE_CACHE);
     r.Start();
 
     base::RunLoop().Run();
 
     EXPECT_TRUE(d.data_received().find("user/secret") != std::string::npos);
 
     // Should be the same cached document.
     EXPECT_TRUE(r.was_cached());
   }
 }
@@ skipping 99 matching lines @@
   // cachable page, we expect this test to result in a 304.  In which case, the
   // response should be fetched from the cache.
   {
     TestDelegate d;
     d.set_credentials(AuthCredentials(kUser, kSecret));
 
     URLRequest r(test_server_.GetURL("auth-basic"),
                  DEFAULT_PRIORITY,
                  &d,
                  &default_context_);
-    r.SetLoadFlags(LOAD_VALIDATE_CACHE);
+    r.set_load_flags(LOAD_VALIDATE_CACHE);
     r.Start();
 
     base::RunLoop().Run();
 
     EXPECT_TRUE(d.data_received().find("user/secret") != std::string::npos);
 
     // Should be the same cached document.
     EXPECT_TRUE(r.was_cached());
 
     // Since there was a request that went over the wire, the load timing
@@ skipping 1811 matching lines @@
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net