Merge Crashpad to the 42.0.2311 branch

base/scoped_generic_unittest.cc

 // Copyright 2014 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 <vector>
 
 #include "base/scoped_generic.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ skipping 67 matching lines @@
     EXPECT_TRUE(values_freed.empty());  // Nothing should be freed.
     EXPECT_EQ(kSecond, a.get());
     EXPECT_EQ(kFirst, b.get());
   }
   // Values should be deleted in the opposite order.
   ASSERT_EQ(2u, values_freed.size());
   EXPECT_EQ(kFirst, values_freed[0]);
   EXPECT_EQ(kSecond, values_freed[1]);
   values_freed.clear();
 
-  // Pass.
+  // Pass constructor.
   {
     ScopedInt a(kFirst, traits);
     ScopedInt b(a.Pass());
     EXPECT_TRUE(values_freed.empty());  // Nothing should be freed.
     ASSERT_EQ(IntTraits::InvalidValue(), a.get());
     ASSERT_EQ(kFirst, b.get());
   }
+
   ASSERT_EQ(1u, values_freed.size());
   ASSERT_EQ(kFirst, values_freed[0]);
+  values_freed.clear();
+
+  // Pass assign.
+  {
+    ScopedInt a(kFirst, traits);
+    ScopedInt b(kSecond, traits);
+    b = a.Pass();
+    ASSERT_EQ(1u, values_freed.size());
+    EXPECT_EQ(kSecond, values_freed[0]);
+    ASSERT_EQ(IntTraits::InvalidValue(), a.get());
+    ASSERT_EQ(kFirst, b.get());
+  }
+
+  ASSERT_EQ(2u, values_freed.size());
+  EXPECT_EQ(kFirst, values_freed[1]);
+  values_freed.clear();
 }
 
 TEST(ScopedGenericTest, Operators) {
   std::vector<int> values_freed;
   IntTraits traits(&values_freed);
 
   static const int kFirst = 0;
   static const int kSecond = 1;
   {
     ScopedInt a(kFirst, traits);
@@ skipping 36 matching lines @@
 
   // Implicit conversion to bool shouldn't work.
   /*{
     ScopedInt a(kFirst, traits);
     bool result = a;
   }*/
 }
 #endif
 
 }  // namespace base