components/image_fetcher: Add a from_http_cache flag to RequestMetadata

components/image_fetcher/image_data_fetcher_unittest.cc

 // Copyright 2016 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 "components/image_fetcher/image_data_fetcher.h"
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 47 matching lines @@
 };
 
 TEST_F(ImageDataFetcherTest, FetchImageData) {
   image_data_fetcher_.FetchImageData(
       GURL(kImageURL),
       base::Bind(&ImageDataFetcherTest::OnImageDataFetched,
                  base::Unretained(this)));
 
   RequestMetadata expected_metadata;
   expected_metadata.mime_type = std::string("image/png");
-  expected_metadata.response_code = net::HTTP_OK;
+  expected_metadata.http_response_code = net::HTTP_OK;
   EXPECT_CALL(*this, OnImageDataFetched(std::string(kURLResponseData),
                                         expected_metadata));
 
   // Get and configure the TestURLFetcher.
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
   ASSERT_NE(nullptr, test_url_fetcher);
   test_url_fetcher->set_status(
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, net::OK));
   test_url_fetcher->SetResponseString(kURLResponseData);
   test_url_fetcher->set_response_code(net::HTTP_OK);
 
   std::string raw_header =
       "HTTP/1.1 200 OK\n"
       "Content-type: image/png\n\n";
   std::replace(raw_header.begin(), raw_header.end(), '\n', '\0');
   scoped_refptr<net::HttpResponseHeaders> headers(
       new net::HttpResponseHeaders(raw_header));
 
   test_url_fetcher->set_response_headers(headers);
 
   // Call the URLFetcher delegate to continue the test.
   test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
 }
 
+TEST_F(ImageDataFetcherTest, FetchImageData_FromCache) {
+  image_data_fetcher_.FetchImageData(
+      GURL(kImageURL), base::Bind(&ImageDataFetcherTest::OnImageDataFetched,
+                                  base::Unretained(this)));
+
+  RequestMetadata expected_metadata;
+  expected_metadata.mime_type = std::string("image/png");
+  expected_metadata.http_response_code = net::HTTP_OK;
+  expected_metadata.from_http_cache = true;
+  EXPECT_CALL(*this, OnImageDataFetched(std::string(kURLResponseData),
+                                        expected_metadata));
+
+  // Get and configure the TestURLFetcher.
+  net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
+  ASSERT_NE(nullptr, test_url_fetcher);
+  test_url_fetcher->set_status(
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, net::OK));
+  test_url_fetcher->SetResponseString(kURLResponseData);
+  test_url_fetcher->set_response_code(net::HTTP_OK);
+  test_url_fetcher->set_was_cached(true);
+
+  std::string raw_header =
+      "HTTP/1.1 200 OK\n"
+      "Content-type: image/png\n\n";
+  std::replace(raw_header.begin(), raw_header.end(), '\n', '\0');
+  scoped_refptr<net::HttpResponseHeaders> headers(
+      new net::HttpResponseHeaders(raw_header));
+
+  test_url_fetcher->set_response_headers(headers);
+
+  // Call the URLFetcher delegate to continue the test.
+  test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
+}
+
 TEST_F(ImageDataFetcherTest, FetchImageData_NotFound) {
   image_data_fetcher_.FetchImageData(
       GURL(kImageURL), base::Bind(&ImageDataFetcherTest::OnImageDataFetched,
                                   base::Unretained(this)));
 
   RequestMetadata expected_metadata;
   expected_metadata.mime_type = std::string("image/png");
-  expected_metadata.response_code = net::HTTP_NOT_FOUND;
+  expected_metadata.http_response_code = net::HTTP_NOT_FOUND;
   // For 404, expect an empty result even though correct image data is sent.
   EXPECT_CALL(*this, OnImageDataFetched(std::string(), expected_metadata));
 
   // Get and configure the TestURLFetcher.
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
   ASSERT_NE(nullptr, test_url_fetcher);
   test_url_fetcher->set_status(
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, net::OK));
   test_url_fetcher->SetResponseString(kURLResponseData);
 
@@ skipping 10 matching lines @@
   test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
 }
 
 TEST_F(ImageDataFetcherTest, FetchImageData_FailedRequest) {
   image_data_fetcher_.FetchImageData(
       GURL(kImageURL),
       base::Bind(&ImageDataFetcherTest::OnImageDataFetchedFailedRequest,
                  base::Unretained(this)));
 
   RequestMetadata expected_metadata;
-  expected_metadata.response_code = net::URLFetcher::RESPONSE_CODE_INVALID;
+  expected_metadata.http_response_code = net::URLFetcher::RESPONSE_CODE_INVALID;
   EXPECT_CALL(
       *this, OnImageDataFetchedFailedRequest(std::string(), expected_metadata));
 
   // Get and configure the TestURLFetcher.
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
   ASSERT_NE(nullptr, test_url_fetcher);
   test_url_fetcher->set_status(
       net::URLRequestStatus(net::URLRequestStatus::FAILED,
                             net::ERR_INVALID_URL));
 
@@ skipping 16 matching lines @@
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
   ASSERT_NE(nullptr, test_url_fetcher);
   test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
 
   test_url_fetcher = fetcher_factory_.GetFetcherByID(1);
   ASSERT_NE(nullptr, test_url_fetcher);
   test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
 }
 
 }  // namespace image_fetcher