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

Side by Side Diff: chrome/test/testing_profile.cc

Issue 7282054: Remove more unnecessary ChromeURLRequestContext members. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add new valgrind sigs Created 9 years, 5 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/test/testing_profile.h" 5 #include "chrome/test/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 ExtensionInfoMap* TestingProfile::GetExtensionInfoMap() { 748 ExtensionInfoMap* TestingProfile::GetExtensionInfoMap() {
749 return NULL; 749 return NULL;
750 } 750 }
751 751
752 PromoCounter* TestingProfile::GetInstantPromoCounter() { 752 PromoCounter* TestingProfile::GetInstantPromoCounter() {
753 return NULL; 753 return NULL;
754 } 754 }
755 755
756 ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() { 756 ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() {
757 if (!chrome_url_data_manager_.get()) 757 if (!chrome_url_data_manager_.get())
758 chrome_url_data_manager_.reset(new ChromeURLDataManager(this)); 758 chrome_url_data_manager_.reset(
759 new ChromeURLDataManager(
760 base::Callback<ChromeURLDataManagerBackend*(void)>()));
759 return chrome_url_data_manager_.get(); 761 return chrome_url_data_manager_.get();
760 } 762 }
761 763
762 prerender::PrerenderManager* TestingProfile::GetPrerenderManager() { 764 prerender::PrerenderManager* TestingProfile::GetPrerenderManager() {
763 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 765 if (!prerender::PrerenderManager::IsPrerenderingPossible())
764 return NULL; 766 return NULL;
765 if (!prerender_manager_.get()) { 767 if (!prerender_manager_.get()) {
766 prerender_manager_.reset(new prerender::PrerenderManager( 768 prerender_manager_.reset(new prerender::PrerenderManager(
767 this, g_browser_process->prerender_tracker())); 769 this, g_browser_process->prerender_tracker()));
768 } 770 }
(...skipping 16 matching lines...) Expand all
785 } 787 }
786 788
787 DerivedTestingProfile::DerivedTestingProfile(Profile* profile) 789 DerivedTestingProfile::DerivedTestingProfile(Profile* profile)
788 : original_profile_(profile) {} 790 : original_profile_(profile) {}
789 791
790 DerivedTestingProfile::~DerivedTestingProfile() {} 792 DerivedTestingProfile::~DerivedTestingProfile() {}
791 793
792 ProfileId DerivedTestingProfile::GetRuntimeId() { 794 ProfileId DerivedTestingProfile::GetRuntimeId() {
793 return original_profile_->GetRuntimeId(); 795 return original_profile_->GetRuntimeId();
794 } 796 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698