Fix a memory leak in PasswordStoreMac

chrome/browser/password_manager/password_store_mac_unittest.cc

Index: chrome/browser/password_manager/password_store_mac_unittest.cc
diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc
index 174a6ed0dbf48c760b9dede17607a7c6f2b198a3..ca50cc6db8af6ac02b3c3425bdbfa6a3020dc9d3 100644
--- a/chrome/browser/password_manager/password_store_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_mac_unittest.cc
@@ -502,14 +502,13 @@ TEST_F(PasswordStoreMacInternalsTest, TestKeychainExactSearch) {
     scoped_ptr<PasswordForm> base_form(CreatePasswordFormFromData(
         base_form_data[i]));
     EXPECT_TRUE(keychain_adapter.HasPasswordsMergeableWithForm(*base_form));
-    PasswordForm* match =
+    scoped_ptr<PasswordForm> match =
         keychain_adapter.PasswordExactlyMatchingForm(*base_form);
-    EXPECT_TRUE(match != NULL);
+    EXPECT_TRUE(match);
     if (match) {
       EXPECT_EQ(base_form->scheme, match->scheme);
       EXPECT_EQ(base_form->origin, match->origin);
       EXPECT_EQ(base_form->username_value, match->username_value);
-      delete match;
     }
 
     // Make sure that the matching isn't looser than it should be by checking
@@ -538,10 +537,10 @@ TEST_F(PasswordStoreMacInternalsTest, TestKeychainExactSearch) {
     }
 
     for (unsigned int j = 0; j < modified_forms.size(); ++j) {
-      PasswordForm* match =
+      scoped_ptr<PasswordForm> match =
           keychain_adapter.PasswordExactlyMatchingForm(*modified_forms[j]);
-      EXPECT_EQ(NULL, match) << "In modified version " << j << " of base form "
-                             << i;
+      EXPECT_EQ(NULL, match.get()) << "In modified version " << j
+          << " of base form " << i;
     }
     STLDeleteElements(&modified_forms);
   }
@@ -651,11 +650,9 @@ TEST_F(PasswordStoreMacInternalsTest, TestKeychainRemove) {
               owned_keychain_adapter.RemovePassword(*form));
 
     MacKeychainPasswordFormAdapter keychain_adapter(keychain_);
-    PasswordForm* match = keychain_adapter.PasswordExactlyMatchingForm(*form);
-    EXPECT_EQ(test_data[i].should_succeed, match == NULL);
-    if (match) {
-      delete match;
-    }
+    scoped_ptr<PasswordForm> match =
+        keychain_adapter.PasswordExactlyMatchingForm(*form);
+    EXPECT_EQ(test_data[i].should_succeed, match.get() == NULL);
   }
 }