Convert Pass()→std::move() on Windows

win8/metro_driver/ime/text_service.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "win8/metro_driver/ime/text_service.h"
 
 #include <msctf.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/win/scoped_variant.h"
 #include "ui/metro_viewer/ime_types.h"
 #include "win8/metro_driver/ime/text_service_delegate.h"
 #include "win8/metro_driver/ime/text_store.h"
 #include "win8/metro_driver/ime/text_store_delegate.h"
 
 // Architecture overview of input method support on Ash mode:
 //
@@ skipping 259 matching lines @@
       if (!text_edit_sink) {
         LOG(ERROR) << "CreateTextEditSink failed.";
         return scoped_ptr<DocumentBinding>();
       }
     }
     hr = document_manager->Push(context.get());
     if (FAILED(hr)) {
       LOG(ERROR) << "ITfDocumentMgr::Push failed. hr = " << hr;
       return scoped_ptr<DocumentBinding>();
     }
-    return scoped_ptr<DocumentBinding>(
-        new DocumentBinding(text_store,
-                            document_manager,
-                            text_edit_sink.Pass()));
+    return scoped_ptr<DocumentBinding>(new DocumentBinding(
+        text_store, document_manager, std::move(text_edit_sink)));
   }
 
   ITfDocumentMgr* document_manager() const { return document_manager_.get(); }
 
   scoped_refptr<TextStore> text_store() const {
     return text_store_;
   }
 
  private:
   DocumentBinding(scoped_refptr<TextStore> text_store,
                   base::win::ScopedComPtr<ITfDocumentMgr> document_manager,
                   scoped_ptr<EventSink> text_edit_sink)
       : text_store_(text_store),
         document_manager_(document_manager),
-        text_edit_sink_(text_edit_sink.Pass()) {}
+        text_edit_sink_(std::move(text_edit_sink)) {}
 
   scoped_refptr<TextStore> text_store_;
   base::win::ScopedComPtr<ITfDocumentMgr> document_manager_;
   scoped_ptr<EventSink> text_edit_sink_;
 
   DISALLOW_COPY_AND_ASSIGN(DocumentBinding);
 };
 
 class TextServiceImpl : public TextService,
                         public TextStoreDelegate {
@@ skipping 162 matching lines @@
   if (!InitializeSentenceMode(thread_manager.get(), client_id)) {
     LOG(ERROR) << "InitializeSentenceMode failed.";
     thread_manager->Deactivate();
     return scoped_ptr<TextService>();
   }
   return scoped_ptr<TextService>(new TextServiceImpl(
       thread_manager.get(), client_id, window_handle, delegate));
 }
 
 }  // namespace metro_driver