Re-enabled URLRequestTestHTTP.BasicAuth....

net/url_request/url_request_unittest.cc

 // Copyright (c) 2006-2009 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 "net/url_request/url_request_unittest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 1189 matching lines @@
     EXPECT_FALSE(d.received_data_before_response());
     EXPECT_EQ(URLRequestStatus::CANCELED, req.status().status());
   }
 }
 
 TEST_F(URLRequestTestHTTP, VaryHeader) {
   ASSERT_TRUE(NULL != server_.get());
 
   scoped_refptr<URLRequestContext> context = new URLRequestTestContext();
 
-  Time response_time;
-
   // populate the cache
   {
     TestDelegate d;
     URLRequest req(server_->TestServerPage("echoheader?foo"), &d);
     req.set_context(context);
     req.SetExtraRequestHeaders("foo:1");
     req.Start();
     MessageLoop::current()->Run();
-
-    response_time = req.response_time();
   }
 
-  // Make sure that the response time of a future response will be in the
-  // future!
-  PlatformThread::Sleep(10);
-
   // expect a cache hit
   {
     TestDelegate d;
     URLRequest req(server_->TestServerPage("echoheader?foo"), &d);
     req.set_context(context);
     req.SetExtraRequestHeaders("foo:1");
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_TRUE(req.response_time() == response_time);
+    EXPECT_TRUE(req.was_cached());
   }
 
   // expect a cache miss
   {
     TestDelegate d;
     URLRequest req(server_->TestServerPage("echoheader?foo"), &d);
     req.set_context(context);
     req.SetExtraRequestHeaders("foo:2");
     req.Start();
     MessageLoop::current()->Run();
 
-    EXPECT_FALSE(req.response_time() == response_time);
+    EXPECT_FALSE(req.was_cached());
   }
 }
 
-// TODO(eroman): Broke with commit of r25484 -- this is depending on
-// the response time value.
-TEST_F(URLRequestTestHTTP, DISABLED_BasicAuth) {
+TEST_F(URLRequestTestHTTP, BasicAuth) {
   scoped_refptr<URLRequestContext> context = new URLRequestTestContext();
   ASSERT_TRUE(NULL != server_.get());
 
-  Time response_time;
-
   // populate the cache
   {
     TestDelegate d;
     d.set_username(L"user");
     d.set_password(L"secret");
 
     URLRequest r(server_->TestServerPage("auth-basic"), &d);
     r.set_context(context);
     r.Start();
 
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("user/secret") != std::string::npos);
-
-    response_time = r.response_time();
   }
 
-  // Let some time pass so we can ensure that a future response will have a
-  // response time value in the future.
-  PlatformThread::Sleep(10 /* milliseconds */);
-
   // repeat request with end-to-end validation.  since auth-basic results in a
   // 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_username(L"user");
     d.set_password(L"secret");
 
     URLRequest r(server_->TestServerPage("auth-basic"), &d);
     r.set_context(context);
     r.set_load_flags(net::LOAD_VALIDATE_CACHE);
     r.Start();
 
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("user/secret") != std::string::npos);
 
-    // Should be the same cached document, which means that the response time
-    // should not have changed.
-    EXPECT_TRUE(response_time == r.response_time());
+    // Should be the same cached document.
+    EXPECT_TRUE(r.was_cached());
   }
 }
 
 // Check that Set-Cookie headers in 401 responses are respected.
 // http://crbug.com/6450
 TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) {
   ASSERT_TRUE(NULL != server_.get());
 
   GURL url_requiring_auth =
       server_->TestServerPage("auth-basic?set-cookie-if-challenged");
@@ skipping 800 matching lines @@
 
     int64 file_size = 0;
     file_util::GetFileSize(app_path, &file_size);
 
     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));
   }
 }