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

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

Issue 8342068: Fix for memory leak 72698 (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removing AUTHOR file to resolve the conflict. Created 9 years, 2 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"
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 if (record_mode || playback_mode) { 386 if (record_mode || playback_mode) {
387 main_cache->set_mode( 387 main_cache->set_mode(
388 record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK); 388 record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
389 } 389 }
390 390
391 main_http_factory_.reset(main_cache); 391 main_http_factory_.reset(main_cache);
392 media_http_factory_.reset(media_cache); 392 media_http_factory_.reset(media_cache);
393 main_context->set_http_transaction_factory(main_cache); 393 main_context->set_http_transaction_factory(main_cache);
394 media_request_context_->set_http_transaction_factory(media_cache); 394 media_request_context_->set_http_transaction_factory(media_cache);
395 395
396 main_context->set_ftp_transaction_factory( 396 ftp_factory_.reset(
397 new net::FtpNetworkLayer(io_thread_globals->host_resolver.get())); 397 new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
398 main_context->set_ftp_transaction_factory(ftp_factory_.get());
398 399
399 main_context->set_chrome_url_data_manager_backend( 400 main_context->set_chrome_url_data_manager_backend(
400 chrome_url_data_manager_backend()); 401 chrome_url_data_manager_backend());
401 402
402 main_context->set_job_factory(job_factory()); 403 main_context->set_job_factory(job_factory());
403 media_request_context_->set_job_factory(job_factory()); 404 media_request_context_->set_job_factory(job_factory());
404 extensions_context->set_job_factory(job_factory()); 405 extensions_context->set_job_factory(job_factory());
405 406
406 job_factory()->AddInterceptor( 407 job_factory()->AddInterceptor(
407 new chrome_browser_net::ConnectInterceptor(predictor_.get())); 408 new chrome_browser_net::ConnectInterceptor(predictor_.get()));
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 scoped_refptr<ChromeURLRequestContext> 485 scoped_refptr<ChromeURLRequestContext>
485 ProfileImplIOData::AcquireIsolatedAppRequestContext( 486 ProfileImplIOData::AcquireIsolatedAppRequestContext(
486 scoped_refptr<ChromeURLRequestContext> main_context, 487 scoped_refptr<ChromeURLRequestContext> main_context,
487 const std::string& app_id) const { 488 const std::string& app_id) const {
488 // We create per-app contexts on demand, unlike the others above. 489 // We create per-app contexts on demand, unlike the others above.
489 scoped_refptr<ChromeURLRequestContext> app_request_context = 490 scoped_refptr<ChromeURLRequestContext> app_request_context =
490 InitializeAppRequestContext(main_context, app_id); 491 InitializeAppRequestContext(main_context, app_id);
491 DCHECK(app_request_context); 492 DCHECK(app_request_context);
492 return app_request_context; 493 return app_request_context;
493 } 494 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.h ('k') | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698