Network traffic annotation stored in url_request.

net/url_request/test_url_fetcher_factory.cc

Index: net/url_request/test_url_fetcher_factory.cc
diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc
index ec9a4546083f8daacc607ca5a56bf78430b0d5f9..dcc3419cfbf0dbde3d3c4ad0bbc26548539f5deb 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -333,7 +333,8 @@ std::unique_ptr<URLFetcher> TestURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
-    URLFetcherDelegate* d) {
+    URLFetcherDelegate* d,
+    NetworkTrafficAnnotationTag traffic_annotation) {
   TestURLFetcher* fetcher = new TestURLFetcher(id, url, d);
   if (remove_fetcher_on_delete_)
     fetcher->set_owner(this);
@@ -442,7 +443,8 @@ std::unique_ptr<URLFetcher> FakeURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
-    URLFetcherDelegate* d) {
+    URLFetcherDelegate* d,
+    NetworkTrafficAnnotationTag traffic_annotation) {
   FakeResponseMap::const_iterator it = fake_responses_.find(url);
   if (it == fake_responses_.end()) {
     if (default_factory_ == NULL) {
@@ -450,7 +452,8 @@ std::unique_ptr<URLFetcher> FakeURLFetcherFactory::CreateURLFetcher(
       DLOG(ERROR) << "No baked response for URL: " << url.spec();
       return NULL;
     } else {
-      return default_factory_->CreateURLFetcher(id, url, request_type, d);
+      return default_factory_->CreateURLFetcher(id, url, request_type, d,
+                                                traffic_annotation);
     }
   }
 
@@ -485,9 +488,10 @@ std::unique_ptr<URLFetcher> URLFetcherImplFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
-    URLFetcherDelegate* d) {
+    URLFetcherDelegate* d,
+    NetworkTrafficAnnotationTag traffic_annotation) {
   return std::unique_ptr<URLFetcher>(
-      new URLFetcherImpl(url, request_type, d, TRAFFIC_ANNOTATION_FOR_TESTS));
+      new URLFetcherImpl(url, request_type, d, traffic_annotation));
 }
 
 }  // namespace net