Followup to commit 274223

chrome/browser/custom_handlers/protocol_handler_registry_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 "chrome/browser/custom_handlers/protocol_handler_registry.h"
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 954 matching lines @@
 }
 
 #define URL_p1u1 "http://p1u1.com/%s"
 #define URL_p1u2 "http://p1u2.com/%s"
 #define URL_p1u3 "http://p1u3.com/%s"
 #define URL_p2u1 "http://p2u1.com/%s"
 #define URL_p2u2 "http://p2u2.com/%s"
 #define URL_p3u1 "http://p3u1.com/%s"
 
 TEST_F(ProtocolHandlerRegistryTest, TestPrefPolicyOverlapRegister) {
-  base::ListValue* handlers_registered_by_pref = new base::ListValue();
-  base::ListValue* handlers_registered_by_policy = new base::ListValue();
+  base::ListValue handlers_registered_by_pref;
+  base::ListValue handlers_registered_by_policy;
 
-  handlers_registered_by_pref->Append(
+  handlers_registered_by_pref.Append(
       GetProtocolHandlerValueWithDefault("p1", URL_p1u2, true));
-  handlers_registered_by_pref->Append(
+  handlers_registered_by_pref.Append(
       GetProtocolHandlerValueWithDefault("p1", URL_p1u1, true));
-  handlers_registered_by_pref->Append(
+  handlers_registered_by_pref.Append(
       GetProtocolHandlerValueWithDefault("p1", URL_p1u2, false));
 
-  handlers_registered_by_policy->Append(
+  handlers_registered_by_policy.Append(
       GetProtocolHandlerValueWithDefault("p1", URL_p1u1, false));
-  handlers_registered_by_policy->Append(
+  handlers_registered_by_policy.Append(
       GetProtocolHandlerValueWithDefault("p3", URL_p3u1, true));
 
-  profile()->GetPrefs()->Set(
-      prefs::kRegisteredProtocolHandlers,
-      *static_cast<base::Value*>(handlers_registered_by_pref));
-  profile()->GetPrefs()->Set(
-      prefs::kPolicyRegisteredProtocolHandlers,
-      *static_cast<base::Value*>(handlers_registered_by_policy));
+  profile()->GetPrefs()->Set(prefs::kRegisteredProtocolHandlers,
+                             handlers_registered_by_pref);
+  profile()->GetPrefs()->Set(prefs::kPolicyRegisteredProtocolHandlers,
+                             handlers_registered_by_policy);
   registry()->InitProtocolSettings();
 
   // Duplicate p1u2 eliminated in memory but not yet saved in pref
   ProtocolHandler p1u1 = CreateProtocolHandler("p1", GURL(URL_p1u1));
   ProtocolHandler p1u2 = CreateProtocolHandler("p1", GURL(URL_p1u2));
   ASSERT_EQ(InPrefHandlerCount(), 3);
   ASSERT_EQ(InMemoryHandlerCount(), 3);
   ASSERT_TRUE(registry()->IsDefault(p1u1));
   ASSERT_FALSE(registry()->IsDefault(p1u2));
 
@@ skipping 41 matching lines @@
   // p1u3 the default handler for p1 removed from user pref and memory.
   ASSERT_EQ(InPrefHandlerCount(), 1);
   ASSERT_EQ(InMemoryHandlerCount(), 3);
   ASSERT_FALSE(registry()->IsDefault(p1u3));
   ASSERT_TRUE(registry()->IsDefault(p1u1));
   ASSERT_TRUE(registry()->IsDefault(p3u1));
   ASSERT_FALSE(registry()->IsDefault(p2u1));
 }
 
 TEST_F(ProtocolHandlerRegistryTest, TestPrefPolicyOverlapIgnore) {
-  base::ListValue* handlers_ignored_by_pref = new base::ListValue();
-  base::ListValue* handlers_ignored_by_policy = new base::ListValue();
+  base::ListValue handlers_ignored_by_pref;
+  base::ListValue handlers_ignored_by_policy;
 
-  handlers_ignored_by_pref->Append(GetProtocolHandlerValue("p1", URL_p1u1));
-  handlers_ignored_by_pref->Append(GetProtocolHandlerValue("p1", URL_p1u2));
-  handlers_ignored_by_pref->Append(GetProtocolHandlerValue("p1", URL_p1u2));
-  handlers_ignored_by_pref->Append(GetProtocolHandlerValue("p3", URL_p3u1));
+  handlers_ignored_by_pref.Append(GetProtocolHandlerValue("p1", URL_p1u1));
+  handlers_ignored_by_pref.Append(GetProtocolHandlerValue("p1", URL_p1u2));
+  handlers_ignored_by_pref.Append(GetProtocolHandlerValue("p1", URL_p1u2));
+  handlers_ignored_by_pref.Append(GetProtocolHandlerValue("p3", URL_p3u1));
 
-  handlers_ignored_by_policy->Append(GetProtocolHandlerValue("p1", URL_p1u2));
-  handlers_ignored_by_policy->Append(GetProtocolHandlerValue("p1", URL_p1u3));
-  handlers_ignored_by_policy->Append(GetProtocolHandlerValue("p2", URL_p2u1));
+  handlers_ignored_by_policy.Append(GetProtocolHandlerValue("p1", URL_p1u2));
+  handlers_ignored_by_policy.Append(GetProtocolHandlerValue("p1", URL_p1u3));
+  handlers_ignored_by_policy.Append(GetProtocolHandlerValue("p2", URL_p2u1));
 
-  profile()->GetPrefs()->Set(
-      prefs::kIgnoredProtocolHandlers,
-      *static_cast<base::Value*>(handlers_ignored_by_pref));
-  profile()->GetPrefs()->Set(
-      prefs::kPolicyIgnoredProtocolHandlers,
-      *static_cast<base::Value*>(handlers_ignored_by_policy));
+  profile()->GetPrefs()->Set(prefs::kIgnoredProtocolHandlers,
+                             handlers_ignored_by_pref);
+  profile()->GetPrefs()->Set(prefs::kPolicyIgnoredProtocolHandlers,
+                             handlers_ignored_by_policy);
   registry()->InitProtocolSettings();
 
   // Duplicate p1u2 eliminated in memory but not yet saved in pref
   ASSERT_EQ(InPrefIgnoredHandlerCount(), 4);
   ASSERT_EQ(InMemoryIgnoredHandlerCount(), 5);
 
   ProtocolHandler p2u2 = CreateProtocolHandler("p2", GURL(URL_p2u2));
   registry()->OnIgnoreRegisterProtocolHandler(p2u2);
 
   // Duplicate p1u2 eliminated in pref, p2u2 added to pref and memory.
@@ skipping 34 matching lines @@
   // added to pref.
   ASSERT_EQ(InPrefIgnoredHandlerCount(), 2);
   ASSERT_EQ(InMemoryIgnoredHandlerCount(), 4);
 
   registry()->RemoveIgnoredHandler(p2u1);
 
   // p2u1 installed by user and policy, so it is removed from pref alone.
   ASSERT_EQ(InPrefIgnoredHandlerCount(), 1);
   ASSERT_EQ(InMemoryIgnoredHandlerCount(), 4);
 }