Extensions: Cleanup usages of ResetAndReturn on OnceCallbacks.

These do not need base::ResetAndReturn, use std::move(callack).Run()
instead.

Change-Id: Ifa90ffffcae8e64fd8cced276e482b3ecf21d6a9
Bug: 812717
Reviewed-on: https://chromium-review.googlesource.com/920645Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537353}

chrome/browser/extensions/api/identity/identity_apitest.cc

@@ -819,7 +819,7 @@ class GetAuthTokenFunctionTest
       const OAuth2TokenService::ScopeSet& scopes) override {
     if (on_access_token_requested_.is_null())
       return;
-    base::ResetAndReturn(&on_access_token_requested_).Run();
+    std::move(on_access_token_requested_).Run();
   }
 
   std::string extension_id_;

chrome/browser/extensions/chrome_app_icon_unittest.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
@@ -74,8 +75,8 @@ class TestAppIcon : public ChromeAppIconDelegate {
   void OnIconUpdated(ChromeAppIcon* icon) override {
     ++icon_update_count_;
     if (icon_update_count_ == icon_update_count_expected_ &&
-        !icon_updated_callback_.is_null()) {
-      base::ResetAndReturn(&icon_updated_callback_).Run();
+        icon_updated_callback_) {
+      std::move(icon_updated_callback_).Run();
     }
   }
 

chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc

@@ -123,7 +123,7 @@ bool BookmarkAppConfirmationView::Accept() {
   web_app_info_.title = GetTrimmedTitle();
   web_app_info_.open_as_window =
       open_as_window_checkbox_ && open_as_window_checkbox_->checked();
-  base::ResetAndReturn(&callback_).Run(true, web_app_info_);
+  std::move(callback_).Run(true, web_app_info_);
   return true;
 }
 

chrome/browser/ui/views/extensions/pwa_confirmation_view.cc

@@ -76,7 +76,7 @@ void PWAConfirmationView::WindowClosing() {
 }
 
 bool PWAConfirmationView::Accept() {
-  base::ResetAndReturn(&callback_).Run(true, web_app_info_);
+  std::move(callback_).Run(true, web_app_info_);
   return true;
 }