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 418 matching lines @@
     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();
-  }
+  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;
-  {
-    ANNOTATE_SCOPED_MEMORY_LEAK;
-    arrow = new Arrow();
-    arrow->target = target.AsWeakPtr();
-  }
+  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);
 }
 
 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).
@@ skipping 111 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