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

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 9371025: Move resource_context.h to content/public/browser. Remove the workaround in its destructor since ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profiles/profile_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "chrome/browser/io_thread.h" 12 #include "chrome/browser/io_thread.h"
13 #include "chrome/browser/net/chrome_net_log.h" 13 #include "chrome/browser/net/chrome_net_log.h"
14 #include "chrome/browser/net/chrome_network_delegate.h" 14 #include "chrome/browser/net/chrome_network_delegate.h"
15 #include "chrome/browser/net/connect_interceptor.h" 15 #include "chrome/browser/net/connect_interceptor.h"
16 #include "chrome/browser/net/http_server_properties_manager.h" 16 #include "chrome/browser/net/http_server_properties_manager.h"
17 #include "chrome/browser/net/predictor.h" 17 #include "chrome/browser/net/predictor.h"
18 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h" 18 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h"
19 #include "chrome/browser/net/sqlite_persistent_cookie_store.h" 19 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
20 #include "chrome/browser/prefs/pref_member.h" 20 #include "chrome/browser/prefs/pref_member.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/common/chrome_constants.h" 22 #include "chrome/common/chrome_constants.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
26 #include "content/browser/resource_context.h"
27 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/resource_context.h"
28 #include "net/base/origin_bound_cert_service.h" 28 #include "net/base/origin_bound_cert_service.h"
29 #include "net/ftp/ftp_network_layer.h" 29 #include "net/ftp/ftp_network_layer.h"
30 #include "net/http/http_cache.h" 30 #include "net/http/http_cache.h"
31 #include "net/url_request/url_request_job_factory.h" 31 #include "net/url_request/url_request_job_factory.h"
32 32
33 using content::BrowserThread; 33 using content::BrowserThread;
34 34
35 namespace { 35 namespace {
36 36
37 void ClearNetworkingHistorySinceOnIOThread( 37 void ClearNetworkingHistorySinceOnIOThread(
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 scoped_refptr<ChromeURLRequestContext> 503 scoped_refptr<ChromeURLRequestContext>
504 ProfileImplIOData::AcquireIsolatedAppRequestContext( 504 ProfileImplIOData::AcquireIsolatedAppRequestContext(
505 scoped_refptr<ChromeURLRequestContext> main_context, 505 scoped_refptr<ChromeURLRequestContext> main_context,
506 const std::string& app_id) const { 506 const std::string& app_id) const {
507 // We create per-app contexts on demand, unlike the others above. 507 // We create per-app contexts on demand, unlike the others above.
508 scoped_refptr<ChromeURLRequestContext> app_request_context = 508 scoped_refptr<ChromeURLRequestContext> app_request_context =
509 InitializeAppRequestContext(main_context, app_id); 509 InitializeAppRequestContext(main_context, app_id);
510 DCHECK(app_request_context); 510 DCHECK(app_request_context);
511 return app_request_context; 511 return app_request_context;
512 } 512 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698