diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 18:05:12 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 18:05:12 +0000 |
commit | dcb421138eca082cdb84d8c0fc23de697634c82a (patch) | |
tree | e897c844d6cc238111f8f1deec9ca04cf220a7a9 | |
parent | 02c29b3895a09d2b62391e5241fe6f6026cf6a65 (diff) | |
download | chromium_src-dcb421138eca082cdb84d8c0fc23de697634c82a.zip chromium_src-dcb421138eca082cdb84d8c0fc23de697634c82a.tar.gz chromium_src-dcb421138eca082cdb84d8c0fc23de697634c82a.tar.bz2 |
Rewrite scoped_ptr<T>(NULL) to use the default ctor in components/.
This is the result of running the rewrite_scoped_ptr_ctor_null tool
across all files built on Linux in the components/ directory.
BUG=173286
Review URL: https://chromiumcodereview.appspot.com/16966002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206117 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed, 11 insertions, 17 deletions
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc index e7b2171..666974f 100644 --- a/components/autofill/browser/autofill_manager.cc +++ b/components/autofill/browser/autofill_manager.cc @@ -1236,7 +1236,7 @@ void AutofillManager::ParseForms(const std::vector<FormData>& forms) { // no form in the page. This give |autocheckout_manager| a chance to // terminate Autocheckout and send Autocheckout status. autocheckout_manager_.OnLoadedPageMetaData( - scoped_ptr<autofill::AutocheckoutPageMetaData>(NULL)); + scoped_ptr<autofill::AutocheckoutPageMetaData>()); } else if (download_manager_) { // Query the server if we have at least one of the forms were parsed. download_manager_->StartQueryRequest(form_structures_.get(), diff --git a/components/autofill/browser/phone_number_i18n.cc b/components/autofill/browser/phone_number_i18n.cc index 17a1348..d8ad08eb 100644 --- a/components/autofill/browser/phone_number_i18n.cc +++ b/components/autofill/browser/phone_number_i18n.cc @@ -228,8 +228,7 @@ bool PhoneNumbersMatch(const base::string16& number_a, PhoneObject::PhoneObject(const base::string16& number, const std::string& region) - : region_(region), - i18n_number_(NULL) { + : region_(region) { DCHECK_EQ(2u, region.size()); // TODO(isherman): Autofill profiles should always have a |region| set, but in // some cases it should be marked as implicit. Otherwise, phone numbers @@ -250,12 +249,9 @@ PhoneObject::PhoneObject(const base::string16& number, } } -PhoneObject::PhoneObject(const PhoneObject& other) : i18n_number_(NULL) { - *this = other; -} +PhoneObject::PhoneObject(const PhoneObject& other) { *this = other; } -PhoneObject::PhoneObject() : i18n_number_(NULL) { -} +PhoneObject::PhoneObject() {} PhoneObject::~PhoneObject() { } diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc index 0db3dda..6082e0f 100644 --- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc +++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc @@ -104,12 +104,13 @@ class MockResourceController : public content::ResourceController { class TestIOThreadState { public: - TestIOThreadState(const GURL& url, int render_process_id, int render_view_id, + TestIOThreadState(const GURL& url, + int render_process_id, + int render_view_id, const std::string& request_method, MockInterceptCallbackReceiver* callback_receiver) - : request_(url, NULL, resource_context_.GetRequestContext()), - throttle_(NULL) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + : request_(url, NULL, resource_context_.GetRequestContext()) { + DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); if (render_process_id != MSG_ROUTING_NONE && render_view_id != MSG_ROUTING_NONE) { content::ResourceRequestInfo::AllocateForTesting( diff --git a/components/webdata/common/web_data_request_manager.cc b/components/webdata/common/web_data_request_manager.cc index 635e1fc..9ea1ad8 100644 --- a/components/webdata/common/web_data_request_manager.cc +++ b/components/webdata/common/web_data_request_manager.cc @@ -16,10 +16,7 @@ WebDataRequest::WebDataRequest(WebDataServiceConsumer* consumer, WebDataRequestManager* manager) - : manager_(manager), - cancelled_(false), - consumer_(consumer), - result_(NULL) { + : manager_(manager), cancelled_(false), consumer_(consumer) { handle_ = manager_->GetNextRequestHandle(); message_loop_ = base::MessageLoop::current(); manager_->RegisterRequest(this); diff --git a/components/webdata/common/web_data_service_backend.cc b/components/webdata/common/web_data_service_backend.cc index 300b182..321ff53 100644 --- a/components/webdata/common/web_data_service_backend.cc +++ b/components/webdata/common/web_data_service_backend.cc @@ -106,7 +106,7 @@ scoped_ptr<WDTypedResult> WebDataServiceBackend::ExecuteReadTask( if (db_ && init_status_ == sql::INIT_OK) { return task.Run(db_.get()); } - return scoped_ptr<WDTypedResult>(NULL); + return scoped_ptr<WDTypedResult>(); } WebDataServiceBackend::~WebDataServiceBackend() { |