| Index: chrome/browser/ui/app_list/test/fake_profile.cc
|
| diff --git a/chrome/browser/ui/app_list/test/fake_profile.cc b/chrome/browser/ui/app_list/test/fake_profile.cc
|
| index 1b5a36b120b81162e9cad6e30fe949b1beed486e..43e5e61b37ee48ff69986ec02b68eb94e5b89fdd 100644
|
| --- a/chrome/browser/ui/app_list/test/fake_profile.cc
|
| +++ b/chrome/browser/ui/app_list/test/fake_profile.cc
|
| @@ -13,7 +13,7 @@ FakeProfile::FakeProfile(const std::string& name, const base::FilePath& path)
|
| path_(path) {
|
| }
|
|
|
| -std::string FakeProfile::GetProfileUserName() {
|
| +std::string FakeProfile::GetProfileUserName() const {
|
| return name_;
|
| }
|
|
|
| @@ -34,51 +34,50 @@ bool FakeProfile::IsOffTheRecord() const {
|
| return false;
|
| }
|
|
|
| -content::DownloadManagerDelegate*
|
| -FakeProfile::GetDownloadManagerDelegate() {
|
| - return NULL;
|
| +content::DownloadManagerDelegate* FakeProfile::GetDownloadManagerDelegate() {
|
| + return nullptr;
|
| }
|
|
|
| net::URLRequestContextGetter* FakeProfile::GetRequestContextForRenderProcess(
|
| int renderer_child_id) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| net::URLRequestContextGetter* FakeProfile::GetMediaRequestContext() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| FakeProfile::GetMediaRequestContextForRenderProcess(
|
| int renderer_child_id) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| FakeProfile::GetMediaRequestContextForStoragePartition(
|
| const base::FilePath& partition_path,
|
| bool in_memory) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| content::ResourceContext* FakeProfile::GetResourceContext() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| content::BrowserPluginGuestManager* FakeProfile::GetGuestManager() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| storage::SpecialStoragePolicy* FakeProfile::GetSpecialStoragePolicy() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| content::PushMessagingService* FakeProfile::GetPushMessagingService() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| content::SSLHostStateDelegate* FakeProfile::GetSSLHostStateDelegate() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| scoped_refptr<base::SequencedTaskRunner>
|
| @@ -87,7 +86,7 @@ FakeProfile::GetIOTaskRunner() {
|
| }
|
|
|
| Profile* FakeProfile::GetOffTheRecordProfile() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| void FakeProfile::DestroyOffTheRecordProfile() {}
|
| @@ -113,31 +112,35 @@ bool FakeProfile::IsLegacySupervised() {
|
| }
|
|
|
| ExtensionSpecialStoragePolicy* FakeProfile::GetExtensionSpecialStoragePolicy() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| PrefService* FakeProfile::GetPrefs() {
|
| - return NULL;
|
| + return nullptr;
|
| +}
|
| +
|
| +const PrefService* FakeProfile::GetPrefs() const {
|
| + return nullptr;
|
| }
|
|
|
| PrefService* FakeProfile::GetOffTheRecordPrefs() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| net::URLRequestContextGetter* FakeProfile::GetRequestContext() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| net::URLRequestContextGetter* FakeProfile::GetRequestContextForExtensions() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| net::SSLConfigService* FakeProfile::GetSSLConfigService() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| HostContentSettingsMap* FakeProfile::GetHostContentSettingsMap() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| bool FakeProfile::IsSameProfile(Profile* profile) {
|
| @@ -151,7 +154,7 @@ base::Time FakeProfile::GetStartTime() const {
|
| net::URLRequestContextGetter* FakeProfile::CreateRequestContext(
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| @@ -160,7 +163,7 @@ FakeProfile::CreateRequestContextForStoragePartition(
|
| bool in_memory,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| base::FilePath FakeProfile::last_selected_directory() {
|
| @@ -177,15 +180,15 @@ void FakeProfile::InitChromeOSPreferences() {}
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| PrefProxyConfigTracker* FakeProfile::GetProxyConfigTracker() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| chrome_browser_net::Predictor* FakeProfile::GetNetworkPredictor() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| DevToolsNetworkController* FakeProfile::GetDevToolsNetworkController() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| void FakeProfile::ClearNetworkingHistorySince(
|
|
|