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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 1406003005: Rename chrome/browser/android/datausage to data_usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test fix Created 5 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 #if defined(ENABLE_EXTENSIONS) 105 #if defined(ENABLE_EXTENSIONS)
106 #include "chrome/browser/extensions/event_router_forwarder.h" 106 #include "chrome/browser/extensions/event_router_forwarder.h"
107 #endif 107 #endif
108 108
109 #if defined(USE_NSS_CERTS) || defined(OS_IOS) 109 #if defined(USE_NSS_CERTS) || defined(OS_IOS)
110 #include "net/cert_net/nss_ocsp.h" 110 #include "net/cert_net/nss_ocsp.h"
111 #endif 111 #endif
112 112
113 #if defined(OS_ANDROID) 113 #if defined(OS_ANDROID)
114 #include "base/android/build_info.h" 114 #include "base/android/build_info.h"
115 #include "chrome/browser/android/datausage/external_data_use_observer.h" 115 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
116 #include "chrome/browser/android/net/external_estimate_provider_android.h" 116 #include "chrome/browser/android/net/external_estimate_provider_android.h"
117 #endif 117 #endif
118 118
119 #if defined(OS_CHROMEOS) 119 #if defined(OS_CHROMEOS)
120 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" 120 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
121 #include "chromeos/network/host_resolver_impl_chromeos.h" 121 #include "chromeos/network/host_resolver_impl_chromeos.h"
122 #endif 122 #endif
123 123
124 using content::BrowserThread; 124 using content::BrowserThread;
125 125
(...skipping 1528 matching lines...) Expand 10 before | Expand all | Expand 10 after
1654 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); 1654 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass();
1655 1655
1656 context->set_job_factory( 1656 context->set_job_factory(
1657 globals->proxy_script_fetcher_url_request_job_factory.get()); 1657 globals->proxy_script_fetcher_url_request_job_factory.get());
1658 1658
1659 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the 1659 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
1660 // system URLRequestContext too. There's no reason this should be tied to a 1660 // system URLRequestContext too. There's no reason this should be tied to a
1661 // profile. 1661 // profile.
1662 return context; 1662 return context;
1663 } 1663 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698