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

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: Merge again 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 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 ExtensionInfoMap* TestingProfile::GetExtensionInfoMap() { 752 ExtensionInfoMap* TestingProfile::GetExtensionInfoMap() {
753 return NULL; 753 return NULL;
754 } 754 }
755 755
756 PromoCounter* TestingProfile::GetInstantPromoCounter() { 756 PromoCounter* TestingProfile::GetInstantPromoCounter() {
757 return NULL; 757 return NULL;
758 } 758 }
759 759
760 ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() { 760 ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() {
761 if (!chrome_url_data_manager_.get()) 761 if (!chrome_url_data_manager_.get())
762 chrome_url_data_manager_.reset(new ChromeURLDataManager(this)); 762 chrome_url_data_manager_.reset(
763 new ChromeURLDataManager(
764 base::Callback<ChromeURLDataManagerBackend*(void)>()));
763 return chrome_url_data_manager_.get(); 765 return chrome_url_data_manager_.get();
764 } 766 }
765 767
766 prerender::PrerenderManager* TestingProfile::GetPrerenderManager() { 768 prerender::PrerenderManager* TestingProfile::GetPrerenderManager() {
767 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 769 if (!prerender::PrerenderManager::IsPrerenderingPossible())
768 return NULL; 770 return NULL;
769 if (!prerender_manager_.get()) { 771 if (!prerender_manager_.get()) {
770 prerender_manager_.reset(new prerender::PrerenderManager( 772 prerender_manager_.reset(new prerender::PrerenderManager(
771 this, g_browser_process->prerender_tracker())); 773 this, g_browser_process->prerender_tracker()));
772 } 774 }
(...skipping 16 matching lines...) Expand all
789 } 791 }
790 792
791 DerivedTestingProfile::DerivedTestingProfile(Profile* profile) 793 DerivedTestingProfile::DerivedTestingProfile(Profile* profile)
792 : original_profile_(profile) {} 794 : original_profile_(profile) {}
793 795
794 DerivedTestingProfile::~DerivedTestingProfile() {} 796 DerivedTestingProfile::~DerivedTestingProfile() {}
795 797
796 ProfileId DerivedTestingProfile::GetRuntimeId() { 798 ProfileId DerivedTestingProfile::GetRuntimeId() {
797 return original_profile_->GetRuntimeId(); 799 return original_profile_->GetRuntimeId();
798 } 800 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698