Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / callback_tracker_internal.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc b/src/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc
index 016424f..96276a9 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc
@@ -24,7 +24,7 @@ base::WeakPtr<AbortHelper> AbortHelper::AsWeakPtr() {
 scoped_ptr<AbortHelper> AbortHelper::TakeOwnership(
     const base::WeakPtr<AbortHelper>& abort_helper) {
   if (!abort_helper)
-    return scoped_ptr<AbortHelper>();
+    return nullptr;
   scoped_ptr<AbortHelper> result =
       abort_helper->tracker_->PassAbortHelper(abort_helper.get());
   abort_helper->weak_ptr_factory_.InvalidateWeakPtrs();