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

Side by Side Diff: blimp/engine/app/blimp_system_url_request_context_getter.cc

Issue 1960813002: Fix DCHECK failure and add unittest for BlimpSystemURLContextGetter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use TestBlimpBrowserThreadBundle instead of deprecated test class. Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "blimp/engine/app/blimp_system_url_request_context_getter.h" 5 #include "blimp/engine/app/blimp_system_url_request_context_getter.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "net/proxy/proxy_service.h"
13 #include "net/url_request/url_request_context.h" 14 #include "net/url_request/url_request_context.h"
14 #include "net/url_request/url_request_context_builder.h" 15 #include "net/url_request/url_request_context_builder.h"
15 16
16 namespace blimp { 17 namespace blimp {
17 namespace engine { 18 namespace engine {
18 19
19 BlimpSystemURLRequestContextGetter::BlimpSystemURLRequestContextGetter() { 20 BlimpSystemURLRequestContextGetter::BlimpSystemURLRequestContextGetter() {
20 // Must first be created on the UI thread. 21 // Must first be created on the UI thread.
21 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 22 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
22 } 23 }
23 24
24 BlimpSystemURLRequestContextGetter::~BlimpSystemURLRequestContextGetter() {} 25 BlimpSystemURLRequestContextGetter::~BlimpSystemURLRequestContextGetter() {}
25 26
26 net::URLRequestContext* 27 net::URLRequestContext*
27 BlimpSystemURLRequestContextGetter::GetURLRequestContext() { 28 BlimpSystemURLRequestContextGetter::GetURLRequestContext() {
28 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 29 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
29 if (!url_request_context_) { 30 if (!url_request_context_) {
30 // Use default values 31 // Use default values
31 net::URLRequestContextBuilder builder; 32 net::URLRequestContextBuilder builder;
33 // TODO(jessicag): See if proxy_service setup should be harmonized with
34 // user request context getter. http://crbug/609981
35 builder.set_proxy_service(net::ProxyService::CreateDirect());
32 url_request_context_ = builder.Build(); 36 url_request_context_ = builder.Build();
33 } 37 }
34 return url_request_context_.get(); 38 return url_request_context_.get();
35 } 39 }
36 40
37 scoped_refptr<base::SingleThreadTaskRunner> 41 scoped_refptr<base::SingleThreadTaskRunner>
38 BlimpSystemURLRequestContextGetter::GetNetworkTaskRunner() const { 42 BlimpSystemURLRequestContextGetter::GetNetworkTaskRunner() const {
39 return content::BrowserThread::GetMessageLoopProxyForThread( 43 return content::BrowserThread::GetMessageLoopProxyForThread(
40 content::BrowserThread::IO); 44 content::BrowserThread::IO);
41 } 45 }
42 46
43 } // namespace engine 47 } // namespace engine
44 } // namespace blimp 48 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/engine/BUILD.gn ('k') | blimp/engine/app/blimp_system_url_request_context_getter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698