Network traffic annotation added to image_data_fetcher.

components/suggestions/image_manager_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 "components/suggestions/image_manager.h"
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/image_fetcher/core/image_fetcher.h"
 #include "components/image_fetcher/core/image_fetcher_delegate.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "components/leveldb_proto/testing/fake_db.h"
 #include "components/suggestions/image_encoder.h"
 #include "components/suggestions/proto/suggestions.pb.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
@@ skipping 11 matching lines @@
 using leveldb_proto::test::FakeDB;
 
 typedef std::map<std::string, ImageData> EntryMap;
 
 void AddEntry(const ImageData& d, EntryMap* map) { (*map)[d.url()] = d; }
 
 class MockImageFetcher : public ImageFetcher {
  public:
   MockImageFetcher() {}
   virtual ~MockImageFetcher() {}
-  MOCK_METHOD3(StartOrQueueNetworkRequest,
+  MOCK_METHOD4(StartOrQueueNetworkRequest,
                void(const std::string&,
                     const GURL&,
-                    const ImageFetcherCallback&));
+                    const ImageFetcherCallback&,
+                    const net::NetworkTrafficAnnotationTag&));
   MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
   MOCK_METHOD1(SetDataUseServiceName, void(DataUseServiceName));
   MOCK_METHOD1(SetImageDownloadLimit,
                void(base::Optional<int64_t> max_download_bytes));
   MOCK_METHOD1(SetDesiredImageFrameSize, void(const gfx::Size&));
   MOCK_METHOD0(GetImageDecoder, image_fetcher::ImageDecoder*());
 };
 
 class ImageManagerTest : public testing::Test {
  public:
@@ skipping 105 matching lines @@
   // Explicitly add the URL and try again.
   image_manager_->AddImageURL(GURL(kTestUrl2), GURL(kTestImagePath));
   EXPECT_TRUE(image_manager_->GetImageURL(GURL(kTestUrl2), &output));
   EXPECT_EQ(GURL(kTestImagePath), output);
 }
 
 TEST_F(ImageManagerTest, GetImageForURLNetwork) {
   InitializeDefaultImageMapAndDatabase(image_manager_.get(), fake_db_);
 
   // We expect the fetcher to go to network and call the callback.
-  EXPECT_CALL(*mock_image_fetcher_, StartOrQueueNetworkRequest(_, _, _));
+  EXPECT_CALL(*mock_image_fetcher_, StartOrQueueNetworkRequest(_, _, _, _));
 
   // Fetch existing URL.
   base::RunLoop run_loop;
   image_manager_->GetImageForURL(GURL(kTestUrl1),
                                  base::Bind(&ImageManagerTest::OnImageAvailable,
                                             base::Unretained(this), &run_loop));
 
   // Will not go to network and use the fetcher since URL is invalid.
   // Fetch non-existing URL.
   image_manager_->GetImageForURL(GURL(kTestUrl2),
@@ skipping 27 matching lines @@
   image_manager_->GetImageForURL(GURL(kTestUrl1),
                                  base::Bind(&ImageManagerTest::OnImageAvailable,
                                             base::Unretained(this), &run_loop));
   run_loop.Run();
 
   EXPECT_EQ(0, num_callback_null_called_);
   EXPECT_EQ(1, num_callback_valid_called_);
 }
 
 }  // namespace suggestions