| Index: extensions/browser/mock_extension_system.cc
|
| diff --git a/extensions/browser/mock_extension_system.cc b/extensions/browser/mock_extension_system.cc
|
| index 8e1902f0cb239cdc9e1888143f40f07c9bef22b7..0d11cedb82c0d000f172023db15b03398ccccd20 100644
|
| --- a/extensions/browser/mock_extension_system.cc
|
| +++ b/extensions/browser/mock_extension_system.cc
|
| @@ -23,63 +23,63 @@ void MockExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
|
| }
|
|
|
| ExtensionService* MockExtensionSystem::extension_service() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| RuntimeData* MockExtensionSystem::runtime_data() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| ManagementPolicy* MockExtensionSystem::management_policy() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| SharedUserScriptMaster* MockExtensionSystem::shared_user_script_master() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| ProcessManager* MockExtensionSystem::process_manager() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| StateStore* MockExtensionSystem::state_store() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| StateStore* MockExtensionSystem::rules_store() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| InfoMap* MockExtensionSystem::info_map() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| LazyBackgroundTaskQueue* MockExtensionSystem::lazy_background_task_queue() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| EventRouter* MockExtensionSystem::event_router() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| WarningService* MockExtensionSystem::warning_service() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| Blacklist* MockExtensionSystem::blacklist() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| ErrorConsole* MockExtensionSystem::error_console() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| InstallVerifier* MockExtensionSystem::install_verifier() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| QuotaService* MockExtensionSystem::quota_service() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| const OneShotEvent& MockExtensionSystem::ready() const {
|
| @@ -87,13 +87,13 @@ const OneShotEvent& MockExtensionSystem::ready() const {
|
| }
|
|
|
| ContentVerifier* MockExtensionSystem::content_verifier() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| DeclarativeUserScriptMaster*
|
| MockExtensionSystem::GetDeclarativeUserScriptMasterByExtension(
|
| const ExtensionId& extension_id) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| scoped_ptr<ExtensionSet> MockExtensionSystem::GetDependentExtensions(
|
|
|