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

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

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 // context is sufficient for now. 849 // context is sufficient for now.
850 return GetRequestContext(); 850 return GetRequestContext();
851 } 851 }
852 852
853 content::ResourceContext* TestingProfile::GetResourceContext() { 853 content::ResourceContext* TestingProfile::GetResourceContext() {
854 if (!resource_context_) 854 if (!resource_context_)
855 resource_context_ = new content::MockResourceContext(); 855 resource_context_ = new content::MockResourceContext();
856 return resource_context_; 856 return resource_context_;
857 } 857 }
858 858
859 HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {
860 // TODO(peconn): Get rid of this function
861 // Don't forget to remove the #include "host_content_settings_map_factory"!
862 return HostContentSettingsMapFactory::GetForProfile(this);
863 }
864
865 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() { 859 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() {
866 #if defined(ENABLE_EXTENSIONS) 860 #if defined(ENABLE_EXTENSIONS)
867 return guest_view::GuestViewManager::FromBrowserContext(this); 861 return guest_view::GuestViewManager::FromBrowserContext(this);
868 #else 862 #else
869 return NULL; 863 return NULL;
870 #endif 864 #endif
871 } 865 }
872 866
873 content::PushMessagingService* TestingProfile::GetPushMessagingService() { 867 content::PushMessagingService* TestingProfile::GetPushMessagingService() {
874 return NULL; 868 return NULL;
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 #if defined(ENABLE_EXTENSIONS) 1040 #if defined(ENABLE_EXTENSIONS)
1047 extension_policy_, 1041 extension_policy_,
1048 #endif 1042 #endif
1049 pref_service_.Pass(), 1043 pref_service_.Pass(),
1050 original_profile, 1044 original_profile,
1051 guest_session_, 1045 guest_session_,
1052 supervised_user_id_, 1046 supervised_user_id_,
1053 policy_service_.Pass(), 1047 policy_service_.Pass(),
1054 testing_factories_); 1048 testing_factories_);
1055 } 1049 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698