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

Side by Side Diff: device/test/usb_test_gadget_impl.cc

Issue 2719123003: Network traffic annotation added to usb_test_gadget_impl. (Closed)
Patch Set: Build modified. Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « device/test/DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
28 #include "base/threading/thread_task_runner_handle.h" 28 #include "base/threading/thread_task_runner_handle.h"
29 #include "base/time/time.h" 29 #include "base/time/time.h"
30 #include "device/base/device_client.h" 30 #include "device/base/device_client.h"
31 #include "device/test/usb_test_gadget.h" 31 #include "device/test/usb_test_gadget.h"
32 #include "device/usb/usb_device.h" 32 #include "device/usb/usb_device.h"
33 #include "device/usb/usb_device_handle.h" 33 #include "device/usb/usb_device_handle.h"
34 #include "device/usb/usb_service.h" 34 #include "device/usb/usb_service.h"
35 #include "net/base/escape.h" 35 #include "net/base/escape.h"
36 #include "net/proxy/proxy_service.h" 36 #include "net/proxy/proxy_service.h"
37 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
37 #include "net/url_request/url_fetcher.h" 38 #include "net/url_request/url_fetcher.h"
38 #include "net/url_request/url_fetcher_delegate.h" 39 #include "net/url_request/url_fetcher_delegate.h"
39 #include "net/url_request/url_request_context.h" 40 #include "net/url_request/url_request_context.h"
40 #include "net/url_request/url_request_context_builder.h" 41 #include "net/url_request/url_request_context_builder.h"
41 #include "net/url_request/url_request_context_getter.h" 42 #include "net/url_request/url_request_context_getter.h"
42 #include "url/gurl.h" 43 #include "url/gurl.h"
43 44
44 namespace device { 45 namespace device {
45 46
46 class UsbTestGadgetImpl : public UsbTestGadget { 47 class UsbTestGadgetImpl : public UsbTestGadget {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 file_path = file_path.AppendASCII("usb_gadget.zip"); 124 file_path = file_path.AppendASCII("usb_gadget.zip");
124 125
125 return ReadFile(file_path, package); 126 return ReadFile(file_path, package);
126 } 127 }
127 128
128 std::unique_ptr<net::URLFetcher> CreateURLFetcher( 129 std::unique_ptr<net::URLFetcher> CreateURLFetcher(
129 scoped_refptr<net::URLRequestContextGetter> request_context_getter, 130 scoped_refptr<net::URLRequestContextGetter> request_context_getter,
130 const GURL& url, 131 const GURL& url,
131 net::URLFetcher::RequestType request_type, 132 net::URLFetcher::RequestType request_type,
132 net::URLFetcherDelegate* delegate) { 133 net::URLFetcherDelegate* delegate) {
133 std::unique_ptr<net::URLFetcher> url_fetcher = 134 std::unique_ptr<net::URLFetcher> url_fetcher = net::URLFetcher::Create(
134 net::URLFetcher::Create(url, request_type, delegate); 135 url, request_type, delegate, TRAFFIC_ANNOTATION_FOR_TESTS);
135 136
136 url_fetcher->SetRequestContext(request_context_getter.get()); 137 url_fetcher->SetRequestContext(request_context_getter.get());
137 138
138 return url_fetcher; 139 return url_fetcher;
139 } 140 }
140 141
141 class URLRequestContextGetter : public net::URLRequestContextGetter { 142 class URLRequestContextGetter : public net::URLRequestContextGetter {
142 public: 143 public:
143 URLRequestContextGetter( 144 URLRequestContextGetter(
144 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner) 145 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 return false; 614 return false;
614 } 615 }
615 616
616 DeviceAddListener add_listener(usb_service_, device_address_, -1); 617 DeviceAddListener add_listener(usb_service_, device_address_, -1);
617 device_ = add_listener.WaitForAdd(); 618 device_ = add_listener.WaitForAdd();
618 DCHECK(device_.get()); 619 DCHECK(device_.get());
619 return true; 620 return true;
620 } 621 }
621 622
622 } // namespace device 623 } // namespace device
OLDNEW
« no previous file with comments | « device/test/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698