Move ResourceResponseHead::error_code to SyncLoadResult.

content/child/resource_dispatcher_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 <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
@@ skipping 232 matching lines @@
         &message_queue_[0], &args));
     EXPECT_EQ(expected_request_id, args.a);
     message_queue_.erase(message_queue_.begin());
   }
 
   void NotifyReceivedRedirect(int request_id) {
     ResourceResponseHead head;
     std::string raw_headers(kTestRedirectHeaders);
     std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0');
     head.headers = new net::HttpResponseHeaders(raw_headers);
-    head.error_code = net::OK;
     net::RedirectInfo redirect_info;
     redirect_info.status_code = 302;
     redirect_info.new_method = "GET";
     redirect_info.new_url = GURL(kTestPageUrl);
     redirect_info.new_first_party_for_cookies = GURL(kTestPageUrl);
     EXPECT_EQ(true, dispatcher_.OnMessageReceived(
         ResourceMsg_ReceivedRedirect(request_id, redirect_info, head)));
   }
 
   void NotifyReceivedResponse(int request_id) {
     ResourceResponseHead head;
     std::string raw_headers(kTestPageHeaders);
     std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0');
     head.headers = new net::HttpResponseHeaders(raw_headers);
     head.mime_type = kTestPageMimeType;
     head.charset = kTestPageCharset;
-    head.error_code = net::OK;
     EXPECT_EQ(true,
               dispatcher_.OnMessageReceived(
                   ResourceMsg_ReceivedResponse(request_id, head)));
   }
 
   void NotifySetDataBuffer(int request_id, size_t buffer_size) {
     base::SharedMemory* shared_memory = new base::SharedMemory();
     ASSERT_FALSE(shared_memory_map_[request_id]);
     shared_memory_map_[request_id] = shared_memory;
     EXPECT_TRUE(shared_memory->CreateAndMapAnonymous(buffer_size));
@@ skipping 472 matching lines @@
 
   const ResourceResponseInfo& response_info() const { return response_info_; }
 
  private:
   ResourceResponseInfo response_info_;
 };
 
 // TODO(simonjam): Enable this when 10829031 lands.
 TEST_F(TimeConversionTest, DISABLED_ProperlyInitialized) {
   ResourceResponseHead response_head;
-  response_head.error_code = net::OK;
   response_head.request_start = base::TimeTicks::FromInternalValue(5);
   response_head.response_start = base::TimeTicks::FromInternalValue(15);
   response_head.load_timing.request_start_time = base::Time::Now();
   response_head.load_timing.request_start =
       base::TimeTicks::FromInternalValue(10);
   response_head.load_timing.connect_timing.connect_start =
       base::TimeTicks::FromInternalValue(13);
 
   PerformTest(response_head);
 
   EXPECT_LT(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
   EXPECT_LE(response_head.load_timing.request_start,
             response_info().load_timing.connect_timing.connect_start);
 }
 
 TEST_F(TimeConversionTest, PartiallyInitialized) {
   ResourceResponseHead response_head;
-  response_head.error_code = net::OK;
   response_head.request_start = base::TimeTicks::FromInternalValue(5);
   response_head.response_start = base::TimeTicks::FromInternalValue(15);
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 TEST_F(TimeConversionTest, NotInitialized) {
   ResourceResponseHead response_head;
-  response_head.error_code = net::OK;
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 }  // namespace content