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

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

Issue 6825038: Create a content::ResourceContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Oops, inverted the assertions. Created 9 years, 8 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 return NULL; 576 return NULL;
577 } 577 }
578 578
579 net::URLRequestContextGetter* TestingProfile::GetRequestContextForIsolatedApp( 579 net::URLRequestContextGetter* TestingProfile::GetRequestContextForIsolatedApp(
580 const std::string& app_id) { 580 const std::string& app_id) {
581 // We don't test isolated app storage here yet, so returning the same dummy 581 // We don't test isolated app storage here yet, so returning the same dummy
582 // context is sufficient for now. 582 // context is sufficient for now.
583 return GetRequestContext(); 583 return GetRequestContext();
584 } 584 }
585 585
586 content::ResourceContextGetter* TestingProfile::GetResourceContext() {
587 return NULL;
588 }
589
586 FindBarState* TestingProfile::GetFindBarState() { 590 FindBarState* TestingProfile::GetFindBarState() {
587 if (!find_bar_state_.get()) 591 if (!find_bar_state_.get())
588 find_bar_state_.reset(new FindBarState()); 592 find_bar_state_.reset(new FindBarState());
589 return find_bar_state_.get(); 593 return find_bar_state_.get();
590 } 594 }
591 595
592 HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() { 596 HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {
593 if (!host_content_settings_map_.get()) 597 if (!host_content_settings_map_.get())
594 host_content_settings_map_ = new HostContentSettingsMap(this); 598 host_content_settings_map_ = new HostContentSettingsMap(this);
595 return host_content_settings_map_.get(); 599 return host_content_settings_map_.get();
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 } 812 }
809 813
810 DerivedTestingProfile::DerivedTestingProfile(Profile* profile) 814 DerivedTestingProfile::DerivedTestingProfile(Profile* profile)
811 : original_profile_(profile) {} 815 : original_profile_(profile) {}
812 816
813 DerivedTestingProfile::~DerivedTestingProfile() {} 817 DerivedTestingProfile::~DerivedTestingProfile() {}
814 818
815 ProfileId DerivedTestingProfile::GetRuntimeId() { 819 ProfileId DerivedTestingProfile::GetRuntimeId() {
816 return original_profile_->GetRuntimeId(); 820 return original_profile_->GetRuntimeId();
817 } 821 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698