Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: ios/chrome/test/app/signin_test_util.mm

Issue 2890293005: Network traffic annotation stored in url_request. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/test/app/signin_test_util.mm
diff --git a/ios/chrome/test/app/signin_test_util.mm b/ios/chrome/test/app/signin_test_util.mm
index 342e1b85b955e6a046ed8ade51e24801fb7365c2..813cb3b076e832b881ccca2ab84ab89e8ed4296a 100644
--- a/ios/chrome/test/app/signin_test_util.mm
+++ b/ios/chrome/test/app/signin_test_util.mm
@@ -20,6 +20,7 @@
#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#import "ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.h"
#include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/test_url_fetcher_factory.h"
#include "net/url_request/url_fetcher_delegate.h"
#include "net/url_request/url_request_status.h"
@@ -38,7 +39,8 @@ class MergeSessionFakeURLFetcherFactory : public net::FakeURLFetcherFactory {
int id,
const GURL& url,
net::URLFetcher::RequestType request_type,
- net::URLFetcherDelegate* d) override {
+ net::URLFetcherDelegate* d,
+ net::NetworkTrafficAnnotationTag traffic_annotation) override {
const GURL kMergeSessionURL =
GURL("https://accounts.google.com/MergeSession");
url::Replacements<char> replacements;
@@ -46,8 +48,8 @@ class MergeSessionFakeURLFetcherFactory : public net::FakeURLFetcherFactory {
replacements.ClearQuery();
if (url.ReplaceComponents(replacements) != kMergeSessionURL) {
// URL is not a MergeSession GET. Use the default method.
- return net::FakeURLFetcherFactory::CreateURLFetcher(id, url, request_type,
- d);
+ return net::FakeURLFetcherFactory::CreateURLFetcher(
+ id, url, request_type, d, traffic_annotation);
}
// Actual MergeSession request. Answer is ignored by the AccountReconcilor,
// so it can also be empty.
« no previous file with comments | « google_apis/gaia/oauth2_api_call_flow_unittest.cc ('k') | net/traffic_annotation/network_traffic_annotation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698