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

Side by Side Diff: ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" 5 #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "base/debug/alias.h" 17 #include "base/debug/alias.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "base/prefs/pref_service.h"
21 #include "base/stl_util.h" 22 #include "base/stl_util.h"
22 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
24 #include "base/thread_task_runner_handle.h" 25 #include "base/thread_task_runner_handle.h"
25 #include "base/threading/sequenced_worker_pool.h" 26 #include "base/threading/sequenced_worker_pool.h"
26 #include "components/about_handler/about_protocol_handler.h" 27 #include "components/about_handler/about_protocol_handler.h"
27 #include "components/content_settings/core/browser/content_settings_provider.h" 28 #include "components/content_settings/core/browser/content_settings_provider.h"
28 #include "components/content_settings/core/browser/cookie_settings.h" 29 #include "components/content_settings/core/browser/cookie_settings.h"
29 #include "components/content_settings/core/browser/host_content_settings_map.h" 30 #include "components/content_settings/core/browser/host_content_settings_map.h"
30 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 31 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
31 #include "components/metrics/metrics_pref_names.h" 32 #include "components/metrics/metrics_pref_names.h"
32 #include "components/net_log/chrome_net_log.h" 33 #include "components/net_log/chrome_net_log.h"
33 #include "components/prefs/pref_service.h"
34 #include "components/signin/core/common/signin_pref_names.h" 34 #include "components/signin/core/common/signin_pref_names.h"
35 #include "components/sync_driver/pref_names.h" 35 #include "components/sync_driver/pref_names.h"
36 #include "ios/chrome/browser/application_context.h" 36 #include "ios/chrome/browser/application_context.h"
37 #include "ios/chrome/browser/chrome_url_constants.h" 37 #include "ios/chrome/browser/chrome_url_constants.h"
38 #include "ios/chrome/browser/content_settings/cookie_settings_factory.h" 38 #include "ios/chrome/browser/content_settings/cookie_settings_factory.h"
39 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory. h" 39 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory. h"
40 #include "ios/chrome/browser/ios_chrome_io_thread.h" 40 #include "ios/chrome/browser/ios_chrome_io_thread.h"
41 #include "ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h" 41 #include "ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h"
42 #include "ios/chrome/browser/net/ios_chrome_network_delegate.h" 42 #include "ios/chrome/browser/net/ios_chrome_network_delegate.h"
43 #include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h" 43 #include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 return scoped_ptr<net::HttpCache>( 483 return scoped_ptr<net::HttpCache>(
484 new net::HttpCache(session, std::move(main_backend), true)); 484 new net::HttpCache(session, std::move(main_backend), true));
485 } 485 }
486 486
487 scoped_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateHttpFactory( 487 scoped_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateHttpFactory(
488 net::HttpNetworkSession* shared_session, 488 net::HttpNetworkSession* shared_session,
489 scoped_ptr<net::HttpCache::BackendFactory> backend) const { 489 scoped_ptr<net::HttpCache::BackendFactory> backend) const {
490 return scoped_ptr<net::HttpCache>( 490 return scoped_ptr<net::HttpCache>(
491 new net::HttpCache(shared_session, std::move(backend), true)); 491 new net::HttpCache(shared_session, std::move(backend), true));
492 } 492 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698