1 files changed, 25 insertions, 23 deletions
diff --git a/chromium/ui/base/class_property_unittest.cc b/chromium/ui/base/class_property_unittest.cc
index 31e85efb709..dcbacd021a9 100644
--- a/chromium/ui/base/class_property_unittest.cc
+++ b/chromium/ui/base/class_property_unittest.cc
@@ -86,29 +86,31 @@ TEST(PropertyTest, Property) {
 }
 
 TEST(PropertyTest, OwnedProperty) {
-  std::unique_ptr<PropertyHandler> h = base::MakeUnique<PropertyHandler>();
-
-  EXPECT_EQ(NULL, h->GetProperty(kOwnedKey));
-  void* last_deleted = TestProperty::last_deleted();
-  TestProperty* p1 = new TestProperty();
-  h->SetProperty(kOwnedKey, p1);
-  EXPECT_EQ(p1, h->GetProperty(kOwnedKey));
-  EXPECT_EQ(last_deleted, TestProperty::last_deleted());
-
-  TestProperty* p2 = new TestProperty();
-  h->SetProperty(kOwnedKey, p2);
-  EXPECT_EQ(p2, h->GetProperty(kOwnedKey));
-  EXPECT_EQ(p1, TestProperty::last_deleted());
-
-  h->ClearProperty(kOwnedKey);
-  EXPECT_EQ(NULL, h->GetProperty(kOwnedKey));
-  EXPECT_EQ(p2, TestProperty::last_deleted());
-
-  TestProperty* p3 = new TestProperty();
-  h->SetProperty(kOwnedKey, p3);
-  EXPECT_EQ(p3, h->GetProperty(kOwnedKey));
-  EXPECT_EQ(p2, TestProperty::last_deleted());
-  h.reset();
+  TestProperty* p3;
+  {
+    PropertyHandler h;
+
+    EXPECT_EQ(NULL, h.GetProperty(kOwnedKey));
+    void* last_deleted = TestProperty::last_deleted();
+    TestProperty* p1 = new TestProperty();
+    h.SetProperty(kOwnedKey, p1);
+    EXPECT_EQ(p1, h.GetProperty(kOwnedKey));
+    EXPECT_EQ(last_deleted, TestProperty::last_deleted());
+
+    TestProperty* p2 = new TestProperty();
+    h.SetProperty(kOwnedKey, p2);
+    EXPECT_EQ(p2, h.GetProperty(kOwnedKey));
+    EXPECT_EQ(p1, TestProperty::last_deleted());
+
+    h.ClearProperty(kOwnedKey);
+    EXPECT_EQ(NULL, h.GetProperty(kOwnedKey));
+    EXPECT_EQ(p2, TestProperty::last_deleted());
+
+    p3 = new TestProperty();
+    h.SetProperty(kOwnedKey, p3);
+    EXPECT_EQ(p3, h.GetProperty(kOwnedKey));
+    EXPECT_EQ(p2, TestProperty::last_deleted());
+  }
   EXPECT_EQ(p3, TestProperty::last_deleted());
 }