diff options
62 files changed, 116 insertions, 210 deletions
diff --git a/chrome/browser/automation/automation_event_queue.cc b/chrome/browser/automation/automation_event_queue.cc index 28401d7..9ccbe2b 100644 --- a/chrome/browser/automation/automation_event_queue.cc +++ b/chrome/browser/automation/automation_event_queue.cc @@ -20,9 +20,7 @@ bool AutomationEventQueue::CompareObserverId::operator()( } AutomationEventQueue::AutomationEventQueue() - : observer_id_count_(0), - wait_automation_reply_(NULL), - wait_observer_id_(-1) {} + : observer_id_count_(0), wait_observer_id_(-1) {} AutomationEventQueue::~AutomationEventQueue() { Clear(); diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index ffd372a..f16a3a6 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -139,10 +139,7 @@ BackgroundApplicationListModel::Application::~Application() { BackgroundApplicationListModel::Application::Application( BackgroundApplicationListModel* model, const Extension* extension) - : extension_(extension), - icon_(NULL), - model_(model) { -} + : extension_(extension), model_(model) {} void BackgroundApplicationListModel::Application::OnImageLoaded( const gfx::Image& image) { diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index a82f3dc..9a0f112 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -107,10 +107,7 @@ typedef std::map<std::string, const char*> CanonicalNameDisplayNameMapType; class CanonicalEncodingMap { public: - CanonicalEncodingMap() - : id_to_encoding_name_map_(NULL), - encoding_name_to_id_map_(NULL), - encoding_name_to_display_name_map_(NULL) { } + CanonicalEncodingMap() {} const IdToCanonicalEncodingNameMapType* GetIdToCanonicalEncodingNameMapData(); const CanonicalEncodingNameToIdMapType* GetCanonicalEncodingNameToIdMapData(); const CanonicalNameDisplayNameMapType* GetCanonicalNameDisplayNameMapData(); diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.cc b/chrome/browser/component_updater/test/component_updater_service_unittest.cc index a7359fb..080b1d2 100644 --- a/chrome/browser/component_updater/test/component_updater_service_unittest.cc +++ b/chrome/browser/component_updater/test/component_updater_service_unittest.cc @@ -185,7 +185,7 @@ class ComponentUpdaterTest : public testing::Test { kTestComponent_jebg }; - ComponentUpdaterTest() : component_updater_(NULL), test_config_(NULL) { + ComponentUpdaterTest() : test_config_(NULL) { // The component updater instance under test. test_config_ = new TestConfigurator; component_updater_.reset(ComponentUpdateServiceFactory(test_config_)); diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index d78cde2..0471735 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -86,7 +86,7 @@ void AssertWillHandleIO( interceptor->Chain(scoped_ptr<net::URLRequestJobFactory>( new FakeURLRequestJobFactory())); ASSERT_EQ(expected, interceptor->IsHandledProtocol(scheme)); - interceptor->Chain(scoped_ptr<net::URLRequestJobFactory>(NULL)); + interceptor->Chain(scoped_ptr<net::URLRequestJobFactory>()); } void AssertWillHandle( diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc index 7f26bb5..7cc7f74 100644 --- a/chrome/browser/download/download_history.cc +++ b/chrome/browser/download/download_history.cc @@ -55,9 +55,7 @@ class DownloadHistoryData : public base::SupportsUserData::Data { } DownloadHistoryData(content::DownloadItem* item, int64 handle) - : is_adding_(false), - db_handle_(handle), - info_(NULL) { + : is_adding_(false), db_handle_(handle) { item->SetUserData(kKey, this); } diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc index fd5e41d..39129df 100644 --- a/chrome/browser/download/download_history_unittest.cc +++ b/chrome/browser/download/download_history_unittest.cc @@ -198,14 +198,12 @@ class FakeHistoryAdapter : public DownloadHistory::HistoryAdapter { class DownloadHistoryTest : public testing::Test { public: DownloadHistoryTest() - : ui_thread_(content::BrowserThread::UI, &loop_), - manager_(new content::MockDownloadManager()), - history_(NULL), - download_history_(NULL), - manager_observer_(NULL), - item_observer_(NULL), - download_created_index_(0) { - } + : ui_thread_(content::BrowserThread::UI, &loop_), + manager_(new content::MockDownloadManager()), + history_(NULL), + manager_observer_(NULL), + item_observer_(NULL), + download_created_index_(0) {} virtual ~DownloadHistoryTest() { STLDeleteElements(&items_); } diff --git a/chrome/browser/extensions/api/declarative/declarative_rule.h b/chrome/browser/extensions/api/declarative/declarative_rule.h index bdc36fe..11d223a 100644 --- a/chrome/browser/extensions/api/declarative/declarative_rule.h +++ b/chrome/browser/extensions/api/declarative/declarative_rule.h @@ -299,7 +299,7 @@ DeclarativeConditionSet<ConditionT>::Create( scoped_ptr<ConditionT> condition = ConditionT::Create(url_matcher_condition_factory, **i, error); if (!error->empty()) - return scoped_ptr<DeclarativeConditionSet>(NULL); + return scoped_ptr<DeclarativeConditionSet>(); result.push_back(make_linked_ptr(condition.release())); } @@ -359,7 +359,7 @@ DeclarativeActionSet<ActionT>::Create( scoped_refptr<const ActionT> action = ActionT::Create(**i, error, bad_message); if (!error->empty() || *bad_message) - return scoped_ptr<DeclarativeActionSet>(NULL); + return scoped_ptr<DeclarativeActionSet>(); result.push_back(action); } diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.cc b/chrome/browser/extensions/api/declarative_content/content_condition.cc index df152af..1d83093 100644 --- a/chrome/browser/extensions/api/declarative_content/content_condition.cc +++ b/chrome/browser/extensions/api/declarative_content/content_condition.cc @@ -69,18 +69,18 @@ scoped_ptr<ContentCondition> ContentCondition::Create( const base::DictionaryValue* condition_dict = NULL; if (!condition.GetAsDictionary(&condition_dict)) { *error = kExpectedDictionary; - return scoped_ptr<ContentCondition>(NULL); + return scoped_ptr<ContentCondition>(); } // Verify that we are dealing with a Condition whose type we understand. std::string instance_type; if (!condition_dict->GetString(keys::kInstanceType, &instance_type)) { *error = kConditionWithoutInstanceType; - return scoped_ptr<ContentCondition>(NULL); + return scoped_ptr<ContentCondition>(); } if (instance_type != keys::kPageStateMatcherType) { *error = kExpectedOtherConditionType; - return scoped_ptr<ContentCondition>(NULL); + return scoped_ptr<ContentCondition>(); } scoped_refptr<URLMatcherConditionSet> url_matcher_condition_set; @@ -123,7 +123,7 @@ scoped_ptr<ContentCondition> ContentCondition::Create( condition_attribute_name.c_str()); } if (!error->empty()) - return scoped_ptr<ContentCondition>(NULL); + return scoped_ptr<ContentCondition>(); } if (!url_matcher_condition_set.get()) { diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc index b2dd1f0..3ac29d6 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc @@ -128,18 +128,18 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create( const base::DictionaryValue* condition_dict = NULL; if (!condition.GetAsDictionary(&condition_dict)) { *error = kExpectedDictionary; - return scoped_ptr<WebRequestCondition>(NULL); + return scoped_ptr<WebRequestCondition>(); } // Verify that we are dealing with a Condition whose type we understand. std::string instance_type; if (!condition_dict->GetString(keys::kInstanceTypeKey, &instance_type)) { *error = kConditionWithoutInstanceType; - return scoped_ptr<WebRequestCondition>(NULL); + return scoped_ptr<WebRequestCondition>(); } if (instance_type != keys::kRequestMatcherType) { *error = kExpectedOtherConditionType; - return scoped_ptr<WebRequestCondition>(NULL); + return scoped_ptr<WebRequestCondition>(); } WebRequestConditionAttributes attributes; @@ -180,7 +180,7 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create( attributes.push_back(attribute); } if (!error->empty()) - return scoped_ptr<WebRequestCondition>(NULL); + return scoped_ptr<WebRequestCondition>(); } scoped_ptr<WebRequestCondition> result( @@ -190,7 +190,7 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create( if (!result->stages()) { *error = kConditionCannotBeFulfilled; - return scoped_ptr<WebRequestCondition>(NULL); + return scoped_ptr<WebRequestCondition>(); } return result.Pass(); diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc index d810c6a..45ff85f 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc @@ -379,12 +379,12 @@ scoped_ptr<const HeaderMatcher> HeaderMatcher::Create( it != tests->end(); ++it) { const DictionaryValue* tests = NULL; if (!(*it)->GetAsDictionary(&tests)) - return scoped_ptr<const HeaderMatcher>(NULL); + return scoped_ptr<const HeaderMatcher>(); scoped_ptr<const HeaderMatchTest> header_test( HeaderMatchTest::Create(tests)); if (header_test.get() == NULL) - return scoped_ptr<const HeaderMatcher>(NULL); + return scoped_ptr<const HeaderMatcher>(); header_tests.push_back(header_test.release()); } @@ -489,7 +489,7 @@ HeaderMatcher::HeaderMatchTest::Create(const base::DictionaryValue* tests) { match_type = StringMatchTest::kEquals; } else { NOTREACHED(); // JSON schema type checking should prevent this. - return scoped_ptr<const HeaderMatchTest>(NULL); + return scoped_ptr<const HeaderMatchTest>(); } const Value* content = &it.value(); @@ -513,7 +513,7 @@ HeaderMatcher::HeaderMatchTest::Create(const base::DictionaryValue* tests) { } default: { NOTREACHED(); // JSON schema type checking should prevent this. - return scoped_ptr<const HeaderMatchTest>(NULL); + return scoped_ptr<const HeaderMatchTest>(); } } } @@ -560,7 +560,7 @@ scoped_ptr<const HeaderMatcher> PrepareHeaderMatcher( const ListValue* value_as_list = NULL; if (!value->GetAsList(&value_as_list)) { *error = ErrorUtils::FormatErrorMessage(kInvalidValue, name); - return scoped_ptr<const HeaderMatcher>(NULL); + return scoped_ptr<const HeaderMatcher>(); } scoped_ptr<const HeaderMatcher> header_matcher( diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc index ebcf75c..e99d63f 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc @@ -350,7 +350,7 @@ scoped_ptr<DictionaryValue> GetDictionaryFromArray( Value* entry = NULL; ListValue* list = NULL; if (!dictionary->GetWithoutPathExpansion(*name, &entry)) - return scoped_ptr<DictionaryValue>(NULL); + return scoped_ptr<DictionaryValue>(); switch (entry->GetType()) { case Value::TYPE_STRING: // Replace the present string with a list. list = new ListValue; @@ -366,7 +366,7 @@ scoped_ptr<DictionaryValue> GetDictionaryFromArray( break; default: NOTREACHED(); // We never put other Values here. - return scoped_ptr<DictionaryValue>(NULL); + return scoped_ptr<DictionaryValue>(); } } else { dictionary->SetString(*name, *value); diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index 7074092..d8fe2c4 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -82,9 +82,7 @@ class NativeMessagingTest : public ::testing::Test, protected: NativeMessagingTest() : current_channel_(chrome::VersionInfo::CHANNEL_DEV), - native_message_process_host_(NULL), - thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) { - } + thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} virtual void SetUp() OVERRIDE { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); diff --git a/chrome/browser/extensions/api/socket/socket_api.cc b/chrome/browser/extensions/api/socket/socket_api.cc index 64a5b5a..b5f781d 100644 --- a/chrome/browser/extensions/api/socket/socket_api.cc +++ b/chrome/browser/extensions/api/socket/socket_api.cc @@ -288,9 +288,7 @@ void SocketBindFunction::Work() { SetResult(Value::CreateIntegerValue(result)); } -SocketListenFunction::SocketListenFunction() - : params_(NULL) { -} +SocketListenFunction::SocketListenFunction() {} SocketListenFunction::~SocketListenFunction() {} @@ -328,9 +326,7 @@ void SocketListenFunction::Work() { SetResult(Value::CreateIntegerValue(result)); } -SocketAcceptFunction::SocketAcceptFunction() - : params_(NULL) { -} +SocketAcceptFunction::SocketAcceptFunction() {} SocketAcceptFunction::~SocketAcceptFunction() {} @@ -363,9 +359,7 @@ void SocketAcceptFunction::OnAccept(int result_code, AsyncWorkCompleted(); } -SocketReadFunction::SocketReadFunction() - : params_(NULL) { -} +SocketReadFunction::SocketReadFunction() {} SocketReadFunction::~SocketReadFunction() {} @@ -442,9 +436,7 @@ void SocketWriteFunction::OnCompleted(int bytes_written) { AsyncWorkCompleted(); } -SocketRecvFromFunction::SocketRecvFromFunction() - : params_(NULL) { -} +SocketRecvFromFunction::SocketRecvFromFunction() {} SocketRecvFromFunction::~SocketRecvFromFunction() {} @@ -556,9 +548,7 @@ void SocketSendToFunction::OnCompleted(int bytes_written) { AsyncWorkCompleted(); } -SocketSetKeepAliveFunction::SocketSetKeepAliveFunction() - : params_(NULL) { -} +SocketSetKeepAliveFunction::SocketSetKeepAliveFunction() {} SocketSetKeepAliveFunction::~SocketSetKeepAliveFunction() {} @@ -582,9 +572,7 @@ void SocketSetKeepAliveFunction::Work() { SetResult(Value::CreateBooleanValue(result)); } -SocketSetNoDelayFunction::SocketSetNoDelayFunction() - : params_(NULL) { -} +SocketSetNoDelayFunction::SocketSetNoDelayFunction() {} SocketSetNoDelayFunction::~SocketSetNoDelayFunction() {} @@ -604,8 +592,7 @@ void SocketSetNoDelayFunction::Work() { SetResult(Value::CreateBooleanValue(result)); } -SocketGetInfoFunction::SocketGetInfoFunction() - : params_(NULL) {} +SocketGetInfoFunction::SocketGetInfoFunction() {} SocketGetInfoFunction::~SocketGetInfoFunction() {} @@ -699,8 +686,7 @@ void SocketGetNetworkListFunction::SendResponseOnUIThread( SendResponse(true); } -SocketJoinGroupFunction::SocketJoinGroupFunction() - : params_(NULL) {} +SocketJoinGroupFunction::SocketJoinGroupFunction() {} SocketJoinGroupFunction::~SocketJoinGroupFunction() {} @@ -744,9 +730,7 @@ void SocketJoinGroupFunction::Work() { SetResult(Value::CreateIntegerValue(result)); } - -SocketLeaveGroupFunction::SocketLeaveGroupFunction() - : params_(NULL) {} +SocketLeaveGroupFunction::SocketLeaveGroupFunction() {} SocketLeaveGroupFunction::~SocketLeaveGroupFunction() {} @@ -790,8 +774,7 @@ void SocketLeaveGroupFunction::Work() { SetResult(Value::CreateIntegerValue(result)); } -SocketSetMulticastTimeToLiveFunction::SocketSetMulticastTimeToLiveFunction() - : params_(NULL) {} +SocketSetMulticastTimeToLiveFunction::SocketSetMulticastTimeToLiveFunction() {} SocketSetMulticastTimeToLiveFunction::~SocketSetMulticastTimeToLiveFunction() {} @@ -822,8 +805,8 @@ void SocketSetMulticastTimeToLiveFunction::Work() { SetResult(Value::CreateIntegerValue(result)); } -SocketSetMulticastLoopbackModeFunction::SocketSetMulticastLoopbackModeFunction() - : params_(NULL) {} +SocketSetMulticastLoopbackModeFunction:: + SocketSetMulticastLoopbackModeFunction() {} SocketSetMulticastLoopbackModeFunction:: ~SocketSetMulticastLoopbackModeFunction() {} @@ -856,8 +839,7 @@ void SocketSetMulticastLoopbackModeFunction::Work() { SetResult(Value::CreateIntegerValue(result)); } -SocketGetJoinedGroupsFunction::SocketGetJoinedGroupsFunction() - : params_(NULL) {} +SocketGetJoinedGroupsFunction::SocketGetJoinedGroupsFunction() {} SocketGetJoinedGroupsFunction::~SocketGetJoinedGroupsFunction() {} diff --git a/chrome/browser/extensions/api/web_request/form_data_parser_unittest.cc b/chrome/browser/extensions/api/web_request/form_data_parser_unittest.cc index e3012db..d6cf715 100644 --- a/chrome/browser/extensions/api/web_request/form_data_parser_unittest.cc +++ b/chrome/browser/extensions/api/web_request/form_data_parser_unittest.cc @@ -17,12 +17,12 @@ scoped_ptr<FormDataParser> InitParser( const std::string& content_type_header, std::vector<std::string>* output) { if (output == NULL) - return scoped_ptr<FormDataParser>(NULL); + return scoped_ptr<FormDataParser>(); output->clear(); scoped_ptr<FormDataParser> parser( FormDataParser::CreateFromContentTypeHeader(&content_type_header)); if (parser.get() == NULL) - return scoped_ptr<FormDataParser>(NULL); + return scoped_ptr<FormDataParser>(); return parser.Pass(); } diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 3130fd3..c77121c 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -86,7 +86,7 @@ scoped_ptr<WebstoreInstaller::Approval> PendingApprovals::PopApproval( return scoped_ptr<WebstoreInstaller::Approval>(approval); } } - return scoped_ptr<WebstoreInstaller::Approval>(NULL); + return scoped_ptr<WebstoreInstaller::Approval>(); } // Uniquely holds the profile and extension id of an install between the time we diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc index e9a03ba..62ffc60 100644 --- a/chrome/browser/extensions/app_sync_bundle.cc +++ b/chrome/browser/extensions/app_sync_bundle.cc @@ -16,8 +16,7 @@ namespace extensions { AppSyncBundle::AppSyncBundle(ExtensionService* extension_service) - : extension_service_(extension_service), - sync_processor_(NULL) {} + : extension_service_(extension_service) {} AppSyncBundle::~AppSyncBundle() {} diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index fcf5cf6..484abd7 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -55,10 +55,8 @@ ExtensionFunction::ExtensionFunction() has_callback_(false), include_incognito_(false), user_gesture_(false), - args_(NULL), bad_message_(false), - histogram_value_(extensions::functions::UNKNOWN) { -} + histogram_value_(extensions::functions::UNKNOWN) {} ExtensionFunction::~ExtensionFunction() { } diff --git a/chrome/browser/extensions/extension_sync_bundle.cc b/chrome/browser/extensions/extension_sync_bundle.cc index 9cf2faf..ef53054 100644 --- a/chrome/browser/extensions/extension_sync_bundle.cc +++ b/chrome/browser/extensions/extension_sync_bundle.cc @@ -16,7 +16,7 @@ namespace extensions { ExtensionSyncBundle::ExtensionSyncBundle(ExtensionService* extension_service) - : extension_service_(extension_service), sync_processor_(NULL) {} + : extension_service_(extension_service) {} ExtensionSyncBundle::~ExtensionSyncBundle() {} diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index bde28f2..5939375 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -63,22 +63,20 @@ const char ExternalProviderImpl::kIsBookmarkApp[] = "is_bookmark_app"; const char ExternalProviderImpl::kIsFromWebstore[] = "is_from_webstore"; const char ExternalProviderImpl::kKeepIfPresent[] = "keep_if_present"; -ExternalProviderImpl::ExternalProviderImpl( - VisitorInterface* service, - ExternalLoader* loader, - Profile* profile, - Manifest::Location crx_location, - Manifest::Location download_location, - int creation_flags) - : crx_location_(crx_location), - download_location_(download_location), - service_(service), - prefs_(NULL), - ready_(false), - loader_(loader), - profile_(profile), - creation_flags_(creation_flags), - auto_acknowledge_(false) { +ExternalProviderImpl::ExternalProviderImpl(VisitorInterface* service, + ExternalLoader* loader, + Profile* profile, + Manifest::Location crx_location, + Manifest::Location download_location, + int creation_flags) + : crx_location_(crx_location), + download_location_(download_location), + service_(service), + ready_(false), + loader_(loader), + profile_(profile), + creation_flags_(creation_flags), + auto_acknowledge_(false) { loader_->Init(this); } diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index ed378e2..b11b3e5 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -121,9 +121,7 @@ MenuItem::MenuItem(const Id& id, type_(type), checked_(checked), enabled_(enabled), - contexts_(contexts), - parent_id_(0) { -} + contexts_(contexts) {} MenuItem::~MenuItem() { STLDeleteElements(&children_); diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 64699ec..2a53a99 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -58,9 +58,7 @@ class IncrementalTimeProvider : public ExtensionPrefs::TimeProvider { } // namespace TestExtensionPrefs::TestExtensionPrefs(base::SequencedTaskRunner* task_runner) - : pref_service_(NULL), - task_runner_(task_runner), - extensions_disabled_(false) { + : task_runner_(task_runner), extensions_disabled_(false) { EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); preferences_file_ = temp_dir_.path().AppendASCII("Preferences"); extensions_dir_ = temp_dir_.path().AppendASCII("Extensions"); diff --git a/chrome/browser/google_apis/drive_api_parser.cc b/chrome/browser/google_apis/drive_api_parser.cc index 0a9d682..fa8872b 100644 --- a/chrome/browser/google_apis/drive_api_parser.cc +++ b/chrome/browser/google_apis/drive_api_parser.cc @@ -223,7 +223,7 @@ scoped_ptr<AboutResource> AboutResource::CreateFrom(const base::Value& value) { scoped_ptr<AboutResource> resource(new AboutResource()); if (!IsResourceKindExpected(value, kAboutKind) || !resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid About resource JSON!"; - return scoped_ptr<AboutResource>(NULL); + return scoped_ptr<AboutResource>(); } return resource.Pass(); } @@ -290,7 +290,7 @@ scoped_ptr<DriveAppIcon> DriveAppIcon::CreateFrom(const base::Value& value) { scoped_ptr<DriveAppIcon> resource(new DriveAppIcon()); if (!resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid DriveAppIcon JSON!"; - return scoped_ptr<DriveAppIcon>(NULL); + return scoped_ptr<DriveAppIcon>(); } return resource.Pass(); } @@ -384,7 +384,7 @@ scoped_ptr<AppResource> AppResource::CreateFrom(const base::Value& value) { scoped_ptr<AppResource> resource(new AppResource()); if (!IsResourceKindExpected(value, kAppKind) || !resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid AppResource JSON!"; - return scoped_ptr<AppResource>(NULL); + return scoped_ptr<AppResource>(); } return resource.Pass(); } @@ -466,7 +466,7 @@ scoped_ptr<AppList> AppList::CreateFrom(const base::Value& value) { scoped_ptr<AppList> resource(new AppList()); if (!IsResourceKindExpected(value, kAppListKind) || !resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid AppList JSON!"; - return scoped_ptr<AppList>(NULL); + return scoped_ptr<AppList>(); } return resource.Pass(); } @@ -524,7 +524,7 @@ ParentReference::CreateFrom(const base::Value& value) { if (!IsResourceKindExpected(value, kParentReferenceKind) || !reference->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid ParentRefernce JSON!"; - return scoped_ptr<ParentReference>(NULL); + return scoped_ptr<ParentReference>(); } return reference.Pass(); } @@ -610,7 +610,7 @@ scoped_ptr<FileResource> FileResource::CreateFrom(const base::Value& value) { scoped_ptr<FileResource> resource(new FileResource()); if (!IsResourceKindExpected(value, kFileKind) || !resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid FileResource JSON!"; - return scoped_ptr<FileResource>(NULL); + return scoped_ptr<FileResource>(); } return resource.Pass(); } @@ -675,7 +675,7 @@ scoped_ptr<FileList> FileList::CreateFrom(const base::Value& value) { scoped_ptr<FileList> resource(new FileList()); if (!HasFileListKind(value) || !resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid FileList JSON!"; - return scoped_ptr<FileList>(NULL); + return scoped_ptr<FileList>(); } return resource.Pass(); } @@ -713,7 +713,7 @@ ChangeResource::CreateFrom(const base::Value& value) { scoped_ptr<ChangeResource> resource(new ChangeResource()); if (!IsResourceKindExpected(value, kChangeKind) || !resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid ChangeResource JSON!"; - return scoped_ptr<ChangeResource>(NULL); + return scoped_ptr<ChangeResource>(); } return resource.Pass(); } @@ -759,7 +759,7 @@ scoped_ptr<ChangeList> ChangeList::CreateFrom(const base::Value& value) { scoped_ptr<ChangeList> resource(new ChangeList()); if (!HasChangeListKind(value) || !resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid ChangeList JSON!"; - return scoped_ptr<ChangeList>(NULL); + return scoped_ptr<ChangeList>(); } return resource.Pass(); } @@ -801,7 +801,7 @@ scoped_ptr<FileLabels> FileLabels::CreateFrom(const base::Value& value) { scoped_ptr<FileLabels> resource(new FileLabels()); if (!resource->Parse(value)) { LOG(ERROR) << "Unable to create: Invalid FileLabels JSON!"; - return scoped_ptr<FileLabels>(NULL); + return scoped_ptr<FileLabels>(); } return resource.Pass(); } diff --git a/chrome/browser/google_apis/drive_api_service.cc b/chrome/browser/google_apis/drive_api_service.cc index 5aefedd..1a8fbc6 100644 --- a/chrome/browser/google_apis/drive_api_service.cc +++ b/chrome/browser/google_apis/drive_api_service.cc @@ -225,7 +225,6 @@ DriveAPIService::DriveAPIService( const std::string& custom_user_agent) : url_request_context_getter_(url_request_context_getter), profile_(NULL), - sender_(NULL), url_generator_(base_url), custom_user_agent_(custom_user_agent) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc index 4d2d09a..8e27223 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser.cc @@ -841,7 +841,7 @@ scoped_ptr<ResourceList> ResourceList::ExtractAndParse( as_dict->GetDictionary(kFeedField, &feed_dict)) { return ResourceList::CreateFrom(*feed_dict); } - return scoped_ptr<ResourceList>(NULL); + return scoped_ptr<ResourceList>(); } // static @@ -849,7 +849,7 @@ scoped_ptr<ResourceList> ResourceList::CreateFrom(const base::Value& value) { scoped_ptr<ResourceList> feed(new ResourceList()); if (!feed->Parse(value)) { DVLOG(1) << "Invalid resource list!"; - return scoped_ptr<ResourceList>(NULL); + return scoped_ptr<ResourceList>(); } return feed.Pass(); @@ -1039,7 +1039,7 @@ scoped_ptr<AccountMetadata> AccountMetadata::CreateFrom( !dictionary->Get(kEntryField, &entry) || !metadata->Parse(*entry)) { LOG(ERROR) << "Unable to create: Invalid account metadata feed!"; - return scoped_ptr<AccountMetadata>(NULL); + return scoped_ptr<AccountMetadata>(); } return metadata.Pass(); diff --git a/chrome/browser/google_apis/gdata_wapi_service.cc b/chrome/browser/google_apis/gdata_wapi_service.cc index 8f6ec69..6bfa14e 100644 --- a/chrome/browser/google_apis/gdata_wapi_service.cc +++ b/chrome/browser/google_apis/gdata_wapi_service.cc @@ -98,7 +98,6 @@ GDataWapiService::GDataWapiService( const GURL& base_url, const std::string& custom_user_agent) : url_request_context_getter_(url_request_context_getter), - sender_(NULL), url_generator_(base_url), custom_user_agent_(custom_user_agent) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index f8ea311b..c85e7e2 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -10,14 +10,13 @@ using content::BrowserThread; -IconLoader::IconLoader(const base::FilePath& file_path, IconSize size, +IconLoader::IconLoader(const base::FilePath& file_path, + IconSize size, Delegate* delegate) : target_message_loop_(NULL), file_path_(file_path), icon_size_(size), - image_(NULL), - delegate_(delegate) { -} + delegate_(delegate) {} IconLoader::~IconLoader() { } diff --git a/chrome/browser/net/dns_probe_service.cc b/chrome/browser/net/dns_probe_service.cc index 8a0e9f0..156313f 100644 --- a/chrome/browser/net/dns_probe_service.cc +++ b/chrome/browser/net/dns_probe_service.cc @@ -275,7 +275,7 @@ scoped_ptr<DnsProbeJob> DnsProbeService::CreateProbeJob( const DnsConfig& dns_config, const DnsProbeJob::CallbackType& job_callback) { if (!dns_config.IsValid()) - return scoped_ptr<DnsProbeJob>(NULL); + return scoped_ptr<DnsProbeJob>(); scoped_ptr<DnsClient> dns_client(DnsClient::CreateClient(NULL)); dns_client->SetConfig(dns_config); diff --git a/chrome/browser/net/dns_probe_service_unittest.cc b/chrome/browser/net/dns_probe_service_unittest.cc index 108332a..15cbb44 100644 --- a/chrome/browser/net/dns_probe_service_unittest.cc +++ b/chrome/browser/net/dns_probe_service_unittest.cc @@ -88,7 +88,7 @@ class TestDnsProbeService : public DnsProbeService { virtual scoped_ptr<DnsProbeJob> CreateSystemProbeJob( const DnsProbeJob::CallbackType& job_callback) OVERRIDE { if (mock_system_fail_) - return scoped_ptr<DnsProbeJob>(NULL); + return scoped_ptr<DnsProbeJob>(); system_job_created_ = true; return scoped_ptr<DnsProbeJob>( diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 4b42e6f..b7061c7 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -126,8 +126,7 @@ class Predictor::LookupRequest { }; Predictor::Predictor(bool preconnect_enabled) - : initial_observer_(NULL), - url_request_context_getter_(NULL), + : url_request_context_getter_(NULL), predictor_enabled_(true), peak_pending_lookups_(0), shutdown_(false), diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.cc b/chrome/browser/net/sqlite_server_bound_cert_store.cc index 698ace0..cf2bca5 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.cc +++ b/chrome/browser/net/sqlite_server_bound_cert_store.cc @@ -40,12 +40,10 @@ class SQLiteServerBoundCertStore::Backend Backend(const base::FilePath& path, quota::SpecialStoragePolicy* special_storage_policy) : path_(path), - db_(NULL), num_pending_(0), force_keep_session_state_(false), special_storage_policy_(special_storage_policy), - corruption_detected_(false) { - } + corruption_detected_(false) {} // Creates or loads the SQLite database. void Load(const LoadedCallback& loaded_callback); diff --git a/chrome/browser/notifications/balloon_notification_ui_manager.cc b/chrome/browser/notifications/balloon_notification_ui_manager.cc index 7c942d8..edbebd4 100644 --- a/chrome/browser/notifications/balloon_notification_ui_manager.cc +++ b/chrome/browser/notifications/balloon_notification_ui_manager.cc @@ -20,9 +20,7 @@ BalloonNotificationUIManager::BalloonNotificationUIManager( PrefService* local_state) - : NotificationUIManagerImpl(), - NotificationPrefsManager(local_state), - balloon_collection_(NULL) { + : NotificationUIManagerImpl(), NotificationPrefsManager(local_state) { position_pref_.Init( prefs::kDesktopNotificationPosition, local_state, diff --git a/chrome/browser/performance_monitor/performance_monitor.cc b/chrome/browser/performance_monitor/performance_monitor.cc index 5f80565..643c4c1 100644 --- a/chrome/browser/performance_monitor/performance_monitor.cc +++ b/chrome/browser/performance_monitor/performance_monitor.cc @@ -98,9 +98,7 @@ PerformanceMonitor::PerformanceDataForIOThread::PerformanceDataForIOThread() : network_bytes_read(0) { } -PerformanceMonitor::PerformanceMonitor() : database_(NULL), - metrics_map_(new MetricsMap) { -} +PerformanceMonitor::PerformanceMonitor() : metrics_map_(new MetricsMap) {} PerformanceMonitor::~PerformanceMonitor() { BrowserThread::PostBlockingPoolSequencedTask( diff --git a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc index cde7ceb..d438964 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc @@ -174,7 +174,6 @@ ResourcePrefetchPredictorTest::ResourcePrefetchPredictorTest() ui_thread_(content::BrowserThread::UI, &loop_), db_thread_(content::BrowserThread::DB, &loop_), profile_(new TestingProfile()), - predictor_(NULL), mock_tables_(new StrictMock<MockResourcePrefetchPredictorTables>()), empty_url_data_(PREFETCH_KEY_TYPE_URL, std::string()), empty_host_data_(PREFETCH_KEY_TYPE_HOST, std::string()) {} diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc index 366d909..aeed782 100644 --- a/chrome/browser/prerender/prerender_unittest.cc +++ b/chrome/browser/prerender/prerender_unittest.cc @@ -94,7 +94,6 @@ class UnitTestPrerenderManager : public PrerenderManager { : PrerenderManager(profile, prerender_tracker), time_(Time::Now()), time_ticks_(TimeTicks::Now()), - next_prerender_contents_(NULL), prerender_tracker_(prerender_tracker) { set_rate_limit_enabled(false); } diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index 37b0758..d6f546a 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc @@ -270,7 +270,7 @@ void OffTheRecordProfileIOData:: // SetUpJobFactoryDefaults() to get this effect. extensions_job_factory_ = SetUpJobFactoryDefaults( extensions_job_factory.Pass(), - scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(NULL), + scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(), NULL, ftp_factory_.get()); extensions_context->set_job_factory(extensions_job_factory_.get()); diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index c153e25..29ce0eb 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -499,7 +499,7 @@ void ProfileImplIOData:: // SetUpJobFactory() to get this effect. extensions_job_factory_ = SetUpJobFactoryDefaults( extensions_job_factory.Pass(), - scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(NULL), + scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(), NULL, ftp_factory_.get()); extensions_context->set_job_factory(extensions_job_factory_.get()); diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 29fb988..dc5a0d1 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -271,7 +271,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) : user_data_dir_(user_data_dir), logged_in_(false), will_import_(false), - profile_shortcut_manager_(NULL), + #if !defined(OS_ANDROID) && !defined(OS_IOS) browser_list_observer_(this), #endif diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc index 5832550..f3e7dec 100644 --- a/chrome/browser/safe_browsing/database_manager.cc +++ b/chrome/browser/safe_browsing/database_manager.cc @@ -74,8 +74,7 @@ SafeBrowsingDatabaseManager::SafeBrowsingCheck::SafeBrowsingCheck( full_hash_results(full_hashes.size(), SB_THREAT_TYPE_SAFE), client(client), need_get_hash(false), - check_type(check_type), - timeout_factory_(NULL) { + check_type(check_type) { DCHECK_EQ(urls.empty(), !full_hashes.empty()) << "Exactly one of urls and full_hashes must be set"; } diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc index 5c4ec37..b59b5c9 100644 --- a/chrome/browser/safe_browsing/malware_details_cache.cc +++ b/chrome/browser/safe_browsing/malware_details_cache.cc @@ -31,11 +31,7 @@ using safe_browsing::ClientMalwareReportRequest; static const uint32 kMaxBodySizeBytes = 1024; MalwareDetailsCacheCollector::MalwareDetailsCacheCollector() - : resources_(NULL), - result_(NULL), - has_started_(false), - current_fetch_(NULL) { -} + : resources_(NULL), result_(NULL), has_started_(false) {} void MalwareDetailsCacheCollector::StartCacheCollection( net::URLRequestContextGetter* request_context_getter, diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index db81dc9..39954d6 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -440,9 +440,6 @@ void SafeBrowsingDatabase::RecordFailure(FailureType failure_type) { SafeBrowsingDatabaseNew::SafeBrowsingDatabaseNew() : creation_loop_(base::MessageLoop::current()), browse_store_(new SafeBrowsingStoreFile), - download_store_(NULL), - csd_whitelist_store_(NULL), - download_whitelist_store_(NULL), reset_factory_(this), corruption_detected_(false), change_detected_(false) { diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.cc b/chrome/browser/safe_browsing/safe_browsing_store_file.cc index 8661faf..bdc5232 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store_file.cc @@ -201,11 +201,7 @@ void SafeBrowsingStoreFile::CheckForOriginalAndDelete( } SafeBrowsingStoreFile::SafeBrowsingStoreFile() - : chunks_written_(0), - file_(NULL), - empty_(false), - corruption_seen_(false) { -} + : chunks_written_(0), empty_(false), corruption_seen_(false) {} SafeBrowsingStoreFile::~SafeBrowsingStoreFile() { Close(); diff --git a/chrome/browser/sync/glue/shared_change_processor_unittest.cc b/chrome/browser/sync/glue/shared_change_processor_unittest.cc index 795d738..56f0059 100644 --- a/chrome/browser/sync/glue/shared_change_processor_unittest.cc +++ b/chrome/browser/sync/glue/shared_change_processor_unittest.cc @@ -37,8 +37,7 @@ class SyncSharedChangeProcessorTest : public testing::Test { public: SyncSharedChangeProcessorTest() : ui_thread_(BrowserThread::UI, &ui_loop_), - db_thread_(BrowserThread::DB), - db_syncable_service_(NULL) {} + db_thread_(BrowserThread::DB) {} virtual ~SyncSharedChangeProcessorTest() { EXPECT_FALSE(db_syncable_service_.get()); diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc index d9f92d0..b05498d 100644 --- a/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc +++ b/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc @@ -50,7 +50,6 @@ class DriveFileSyncServiceSyncTest : public testing::Test { : ui_thread_(content::BrowserThread::UI, &message_loop_), file_thread_(content::BrowserThread::FILE, &message_loop_), fake_api_util_(NULL), - fake_remote_processor_(NULL), metadata_store_(NULL), resource_count_(0) {} diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc index 96dae8d..1521830e 100644 --- a/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc +++ b/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc @@ -44,8 +44,7 @@ class DriveFileSyncServiceTest : public testing::Test { : ui_thread_(content::BrowserThread::UI, &message_loop_), file_thread_(content::BrowserThread::FILE, &message_loop_), fake_api_util_(NULL), - metadata_store_(NULL), - sync_service_(NULL) {} + metadata_store_(NULL) {} virtual void SetUp() OVERRIDE { RegisterSyncableFileSystem(); diff --git a/chrome/browser/translate/translate_manager_metrics_unittest.cc b/chrome/browser/translate/translate_manager_metrics_unittest.cc index bc2f2ea..3425e74 100644 --- a/chrome/browser/translate/translate_manager_metrics_unittest.cc +++ b/chrome/browser/translate/translate_manager_metrics_unittest.cc @@ -20,10 +20,7 @@ namespace { class MetricsRecorder { public: - explicit MetricsRecorder(const char* key) - : key_(key), - base_samples_(NULL), - samples_(NULL) { + explicit MetricsRecorder(const char* key) : key_(key) { StatisticsRecorder::Initialize(); HistogramBase* histogram = StatisticsRecorder::FindHistogram(key_); diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc index 10ecab5..7a20f6b 100644 --- a/chrome/browser/ui/gtk/custom_button.cc +++ b/chrome/browser/ui/gtk/custom_button.cc @@ -37,8 +37,7 @@ CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider, int pressed_id, int hover_id, int disabled_id) - : background_image_(NULL), - paint_override_(-1), + : paint_override_(-1), normal_id_(normal_id), pressed_id_(pressed_id), hover_id_(hover_id), diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index 237458c..f8f6897d 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc @@ -104,11 +104,8 @@ BalloonViewImpl::BalloonViewImpl(BalloonCollection* collection) hbox_(NULL), html_container_(NULL), weak_factory_(this), - close_button_(NULL), - animation_(NULL), menu_showing_(false), - pending_close_(false) { -} + pending_close_(false) {} BalloonViewImpl::~BalloonViewImpl() { if (frame_container_) { diff --git a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc index ea0bf0f..4ec5151 100644 --- a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc +++ b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc @@ -220,8 +220,7 @@ WebsiteSettingsPopupGtk::WebsiteSettingsPopupGtk( identity_contents_(NULL), connection_contents_(NULL), first_visit_contents_(NULL), - notebook_(NULL), - presenter_(NULL) { + notebook_(NULL) { BrowserWindowGtk* browser_window = BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent); browser_ = browser_window->browser(); diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc index eea7de3..9a3e084 100644 --- a/chrome/browser/ui/search/instant_controller.cc +++ b/chrome/browser/ui/search/instant_controller.cc @@ -540,7 +540,7 @@ bool InstantController::WillFetchCompletions() const { scoped_ptr<content::WebContents> InstantController::ReleaseNTPContents() { if (!extended_enabled() || !browser_->profile() || browser_->profile()->IsOffTheRecord()) - return scoped_ptr<content::WebContents>(NULL); + return scoped_ptr<content::WebContents>(); LOG_INSTANT_DEBUG_EVENT(this, "ReleaseNTPContents"); diff --git a/chrome/browser/ui/search/instant_controller_unittest.cc b/chrome/browser/ui/search/instant_controller_unittest.cc index fb2ddea..d449236 100644 --- a/chrome/browser/ui/search/instant_controller_unittest.cc +++ b/chrome/browser/ui/search/instant_controller_unittest.cc @@ -50,9 +50,7 @@ class TestableInstantController : public InstantController { TestableInstantController() : InstantController(NULL, true), test_instant_url_("http://test_url"), - test_extended_enabled_(true), - test_overlay_(NULL) { - } + test_extended_enabled_(true) {} // Overrides from InstantController virtual std::string GetInstantURL() const OVERRIDE { diff --git a/chrome/browser/ui/search/instant_loader.cc b/chrome/browser/ui/search/instant_loader.cc index 1e20126..79d0031 100644 --- a/chrome/browser/ui/search/instant_loader.cc +++ b/chrome/browser/ui/search/instant_loader.cc @@ -33,10 +33,7 @@ InstantLoader::Delegate::~Delegate() { } InstantLoader::InstantLoader(Delegate* delegate) - : delegate_(delegate), - contents_(NULL), - stale_page_timer_(false, false) { -} + : delegate_(delegate), stale_page_timer_(false, false) {} InstantLoader::~InstantLoader() { } diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc index c13a98e..a7f405e 100644 --- a/chrome/browser/ui/website_settings/website_settings_unittest.cc +++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc @@ -74,12 +74,7 @@ class MockWebsiteSettingsUI : public WebsiteSettingsUI { class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness { public: - WebsiteSettingsTest() - : website_settings_(NULL), - mock_ui_(NULL), - cert_id_(0), - url_("http://www.example.com") { - } + WebsiteSettingsTest() : cert_id_(0), url_("http://www.example.com") {} virtual ~WebsiteSettingsTest() { } diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index 69b711a..02d3a85 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc @@ -23,9 +23,7 @@ namespace options { -StartupPagesHandler::StartupPagesHandler() - : startup_custom_pages_table_model_(NULL) { -} +StartupPagesHandler::StartupPagesHandler() {} StartupPagesHandler::~StartupPagesHandler() { diff --git a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util.cc b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util.cc index 4f9c71e..2e8a9c1 100644 --- a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util.cc +++ b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util.cc @@ -172,7 +172,7 @@ scoped_ptr<VectorOfMetricVectors> AggregateMetric( const base::TimeDelta& resolution, AggregationMethod method) { if (!metrics || intervals.empty()) - return scoped_ptr<VectorOfMetricVectors>(NULL); + return scoped_ptr<VectorOfMetricVectors>(); CHECK(resolution > base::TimeDelta()); @@ -188,7 +188,7 @@ scoped_ptr<VectorOfMetricVectors> AggregateMetric( type, metrics, start, intervals, resolution); default: NOTREACHED(); - return scoped_ptr<VectorOfMetricVectors>(NULL); + return scoped_ptr<VectorOfMetricVectors>(); } } diff --git a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc index 92e379e..d120f38 100644 --- a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc +++ b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc @@ -42,7 +42,7 @@ class PerformanceMonitorUtilTest : public ::testing::Test { break; default: NOTREACHED(); - return scoped_ptr<Database::MetricVector>(NULL); + return scoped_ptr<Database::MetricVector>(); } return aggregator->AggregateInterval( type, &metric, metrics->end(), start, kMaxTime, resolution); diff --git a/chrome/browser/value_store/value_store_frontend_unittest.cc b/chrome/browser/value_store/value_store_frontend_unittest.cc index cc3ca1f..62295c7 100644 --- a/chrome/browser/value_store/value_store_frontend_unittest.cc +++ b/chrome/browser/value_store/value_store_frontend_unittest.cc @@ -68,7 +68,7 @@ class ValueStoreFrontendTest : public testing::Test { }; TEST_F(ValueStoreFrontendTest, GetExistingData) { - scoped_ptr<base::Value> value(NULL); + scoped_ptr<base::Value> value; ASSERT_FALSE(Get("key0", &value)); // Test existing keys in the DB. @@ -97,7 +97,7 @@ TEST_F(ValueStoreFrontendTest, ChangesPersistAfterReload) { // Reload the DB and test our changes. ResetStorage(); - scoped_ptr<base::Value> value(NULL); + scoped_ptr<base::Value> value; { ASSERT_TRUE(Get("key0", &value)); int result; diff --git a/chrome/common/extensions/permissions/api_permission.cc b/chrome/common/extensions/permissions/api_permission.cc index 2943649..e1ce208 100644 --- a/chrome/common/extensions/permissions/api_permission.cc +++ b/chrome/common/extensions/permissions/api_permission.cc @@ -55,7 +55,7 @@ class SimpleAPIPermission : public APIPermission { } virtual scoped_ptr<base::Value> ToValue() const OVERRIDE { - return scoped_ptr<base::Value>(NULL); + return scoped_ptr<base::Value>(); } virtual APIPermission* Clone() const OVERRIDE { diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 4987ac1..4d836d2 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -126,9 +126,7 @@ void UserScriptSlave::RemoveIsolatedWorld(const std::string& extension_id) { } UserScriptSlave::UserScriptSlave(const ExtensionSet* extensions) - : shared_memory_(NULL), - script_deleter_(&scripts_), - extensions_(extensions) { + : script_deleter_(&scripts_), extensions_(extensions) { api_js_ = ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_GREASEMONKEY_API_JS); } diff --git a/chrome/renderer/translate/translate_helper_metrics_unittest.cc b/chrome/renderer/translate/translate_helper_metrics_unittest.cc index 4434e24..1ac438a 100644 --- a/chrome/renderer/translate/translate_helper_metrics_unittest.cc +++ b/chrome/renderer/translate/translate_helper_metrics_unittest.cc @@ -25,10 +25,7 @@ const int kFalse = 0; class MetricsRecorder { public: - explicit MetricsRecorder(const char* key) - : key_(key), - base_samples_(NULL), - samples_(NULL) { + explicit MetricsRecorder(const char* key) : key_(key) { StatisticsRecorder::Initialize(); HistogramBase* histogram = StatisticsRecorder::FindHistogram(key_); diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index 9f71b30..748ef81 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -34,8 +34,7 @@ class TrackingTestURLRequestContextGetter base::MessageLoopProxy* io_message_loop_proxy, net::URLRequestThrottlerManager* throttler_manager) : TestURLRequestContextGetter(io_message_loop_proxy), - throttler_manager_(throttler_manager), - context_(NULL) { + throttler_manager_(throttler_manager) { g_request_context_getter_instances++; } diff --git a/chrome/test/chromedriver/chrome/performance_logger_unittest.cc b/chrome/test/chromedriver/chrome/performance_logger_unittest.cc index 8f655b0..a3a3627 100644 --- a/chrome/test/chromedriver/chrome/performance_logger_unittest.cc +++ b/chrome/test/chromedriver/chrome/performance_logger_unittest.cc @@ -103,13 +103,13 @@ scoped_ptr<DictionaryValue> ParseDictionary(const std::string& json) { SCOPED_TRACE(json.c_str()); SCOPED_TRACE(error.c_str()); ADD_FAILURE(); - return scoped_ptr<DictionaryValue>(NULL); + return scoped_ptr<DictionaryValue>(); } DictionaryValue* dict = NULL; if (!value->GetAsDictionary(&dict)) { SCOPED_TRACE("JSON object is not a dictionary"); ADD_FAILURE(); - return scoped_ptr<DictionaryValue>(NULL); + return scoped_ptr<DictionaryValue>(); } return scoped_ptr<DictionaryValue>(dict->DeepCopy()); } |