Network traffic annotation added to chrome::BitmapFetcher.

chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h

 // 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.
 #ifndef CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_H_
 #define CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/containers/mru_cache.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace content {
 class BrowserContext;
 }  // namespace content
 
 namespace chrome {
 class BitmapFetcher;
 }  // namespace chrome
 
 class BitmapFetcherRequest;
@@ skipping 24 matching lines @@
   // Cancels a request, if it is still in-flight.
   void CancelRequest(RequestId requestId);
 
   // Requests a new image. Will either trigger download or satisfy from cache.
   // Takes ownership of |observer|. If there are too many outstanding requests,
   // the request will fail and |observer| will be called to signal failure.
   // Otherwise, |observer| will be called with either the cached image or the
   // downloaded one.
   // NOTE: The observer might be called back synchronously from RequestImage if
   // the image is already in the cache.
-  RequestId RequestImage(const GURL& url, Observer* observer);
+  RequestId RequestImage(
+      const GURL& url,
+      Observer* observer,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
 
   // Start fetching the image at the given |url|.
-  void Prefetch(const GURL& url);
+  void Prefetch(const GURL& url,
+                const net::NetworkTrafficAnnotationTag& traffic_annotation);
 
  protected:
   // Create a bitmap fetcher for the given |url| and start it. Virtual method
   // so tests can override this for different behavior.
-  virtual std::unique_ptr<chrome::BitmapFetcher> CreateFetcher(const GURL& url);
+  virtual std::unique_ptr<chrome::BitmapFetcher> CreateFetcher(
+      const GURL& url,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
 
  private:
   friend class BitmapFetcherServiceTest;
 
   // Gets the existing fetcher for |url| or constructs a new one if it doesn't
   // exist.
-  const chrome::BitmapFetcher* EnsureFetcherForUrl(const GURL& url);
+  const chrome::BitmapFetcher* EnsureFetcherForUrl(
+      const GURL& url,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
 
   // Find a fetcher with a given |url|. Return NULL if none is found.
   const chrome::BitmapFetcher* FindFetcherForUrl(const GURL& url);
 
   // Remove |fetcher| from list of active fetchers. |fetcher| MUST be part of
   // the list.
   void RemoveFetcher(const chrome::BitmapFetcher* fetcher);
 
   // BitmapFetcherDelegate implementation.
   void OnFetchComplete(const GURL& url, const SkBitmap* bitmap) override;
@@ skipping 16 matching lines @@
   // Current request ID to be used.
   int current_request_id_;
 
   // Browser context this service is active for.
   content::BrowserContext* context_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapFetcherService);
 };
 
 #endif  // CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_H_