Fix leak in WeakPtrTest::NonOwnerThreadCanCopyAndAssignWeakPtr{,Base}

base/memory/weak_ptr_unittest.cc

 // Copyright (c) 2012 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 "base/memory/weak_ptr.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 414 matching lines @@
   {
     Target target;
     Arrow arrow;
     arrow.target = target.AsWeakPtr();
     background.CreateArrowFromArrow(&arrow_copy, &arrow);
   }
   EXPECT_EQ(NULL, arrow_copy->target.get());
   background.DeleteArrow(arrow_copy);
 }
 
-TEST(WeakPtrTest, NonOwnerThreadCanCopyAndAssignWeakPtr) {
-  // Main thread creates a Target object.
-  Target target;
-  // Main thread creates an arrow referencing the Target.
-  Arrow *arrow;
-  {
-    ANNOTATE_SCOPED_MEMORY_LEAK;
-    arrow = new Arrow();
-    arrow->target = target.AsWeakPtr();
-  }
-  // Background can copy and assign arrow (as well as the WeakPtr inside).
-  BackgroundThread background;
-  background.Start();
-  background.CopyAndAssignArrow(arrow);
-}
-
-TEST(WeakPtrTest, NonOwnerThreadCanCopyAndAssignWeakPtrBase) {
-  // Main thread creates a Target object.
-  Target target;
-  // Main thread creates an arrow referencing the Target.
-  Arrow *arrow;
-  {
-    ANNOTATE_SCOPED_MEMORY_LEAK;
-    arrow = new Arrow();
-    arrow->target = target.AsWeakPtr();
-  }
-  // Background can copy and assign arrow's WeakPtr to a base class WeakPtr.
-  BackgroundThread background;
-  background.Start();
-  background.CopyAndAssignArrowBase(arrow);
-}
-
 TEST(WeakPtrTest, NonOwnerThreadCanDeleteWeakPtr) {
   // Main thread creates a Target object.
   Target target;
   // Main thread creates an arrow referencing the Target.
   Arrow* arrow = new Arrow();
   arrow->target = target.AsWeakPtr();
 
   // Background can delete arrow (as well as the WeakPtr inside).
   BackgroundThread background;
   background.Start();
   background.DeleteArrow(arrow);
 }
 
+TEST(WeakPtrTest, NonOwnerThreadCanCopyAndAssignWeakPtr) {

[jar (doing other things), 2013/06/10 03:32:41]

Why did you move the two test methods down (below TEST(WeakPtrTest,
NonOwnerThreadCanDeleteWeakPtr) ) as it makes the review tools show separate
blocks (only makes it harder to review).

[akalin, 2013/06/10 17:58:21]

I think that's the logical order of the tests, since it seems better to verify
that deletion on another thread works before relying on that fact in the two
tests I moved.

But it's not a big deal, so I moved it back.

+  // Main thread creates a Target object.
+  Target target;
+  // Main thread creates an arrow referencing the Target.
+  Arrow *arrow = new Arrow();
+  arrow->target = target.AsWeakPtr();
+
+  // Background can copy and assign arrow (as well as the WeakPtr inside).
+  BackgroundThread background;
+  background.Start();
+  background.CopyAndAssignArrow(arrow);
+  background.DeleteArrow(arrow);
+}
+
+TEST(WeakPtrTest, NonOwnerThreadCanCopyAndAssignWeakPtrBase) {
+  // Main thread creates a Target object.
+  Target target;
+  // Main thread creates an arrow referencing the Target.
+  Arrow *arrow = new Arrow();
+  arrow->target = target.AsWeakPtr();
+
+  // Background can copy and assign arrow's WeakPtr to a base class WeakPtr.
+  BackgroundThread background;
+  background.Start();
+  background.CopyAndAssignArrowBase(arrow);
+  background.DeleteArrow(arrow);
+}
+
 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
 
 TEST(WeakPtrDeathTest, WeakPtrCopyDoesNotChangeThreadBinding) {
   // The default style "fast" does not support multi-threaded tests
   // (introduces deadlock on Linux).
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
 
   BackgroundThread background;
   background.Start();
 
@@ skipping 96 matching lines @@
   background.Start();
   background.DeleteTarget(target.release());
 
   // Main thread attempts to dereference the target, violating thread binding.
   ASSERT_DEATH(arrow.target.get(), "");
 }
 
 #endif
 
 }  // namespace base