Merge to XFA: Start using allowed C++11 features.

third_party/base/nonstd_unique_ptr_unittest.cpp

 // Copyright 2015 PDFium 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 <sstream>
+#include <utility>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "macros.h"
 #include "nonstd_unique_ptr.h"
 
 using nonstd::unique_ptr;
 
 namespace {
 
 // Used to test depth subtyping.
@@ skipping 42 matching lines @@
 }  // namespace
 
 TEST(UniquePtrTest, MoveTest) {
   int constructed = 0;
   int constructed4 = 0;
   {
     unique_ptr<CtorDtorLogger> ptr1(new CtorDtorLogger(&constructed));
     EXPECT_EQ(1, constructed);
     EXPECT_TRUE(ptr1);
 
-    unique_ptr<CtorDtorLogger> ptr2(nonstd::move(ptr1));
+    unique_ptr<CtorDtorLogger> ptr2(std::move(ptr1));
     EXPECT_EQ(1, constructed);
     EXPECT_FALSE(ptr1);
     EXPECT_TRUE(ptr2);
 
     unique_ptr<CtorDtorLogger> ptr3;
-    ptr3 = nonstd::move(ptr2);
+    ptr3 = std::move(ptr2);
     EXPECT_EQ(1, constructed);
     EXPECT_FALSE(ptr2);
     EXPECT_TRUE(ptr3);
 
     unique_ptr<CtorDtorLogger> ptr4(new CtorDtorLogger(&constructed4));
     EXPECT_EQ(1, constructed4);
-    ptr4 = nonstd::move(ptr3);
+    ptr4 = std::move(ptr3);
     EXPECT_EQ(0, constructed4);
     EXPECT_FALSE(ptr3);
     EXPECT_TRUE(ptr4);
   }
   EXPECT_EQ(0, constructed);
 }
 
 TEST(UniquePtrTest, UniquePtr) {
   int constructed = 0;
 
@@ skipping 289 matching lines @@
 TEST(ScopedPtrTest, LoggingDoesntConvertToBoolean) {
   unique_ptr<int> x(new int);
   std::stringstream s1;
   s1 << x;
 
   std::stringstream s2;
   s2 << x.get();
 
   EXPECT_EQ(s2.str(), s1.str());
 }