AutofillMergeTest doesn't need scoped_ptr for PersonalDataManager mock

chrome/browser/autofill/autofill_merge_unittest.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 110 matching lines @@
   virtual void SetUp();
 
   // DataDrivenTest:
   virtual void GenerateResults(const std::string& input,
                                std::string* output) OVERRIDE;
 
   // Deserializes a set of Autofill profiles from |profiles|, imports each
   // sequentially, and fills |merged_profiles| with the serialized result.
   void MergeProfiles(const std::string& profiles, std::string* merged_profiles);
 
-  scoped_ptr<PersonalDataManagerMock> personal_data_;
+  PersonalDataManagerMock personal_data_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutofillMergeTest);
 };
 
 AutofillMergeTest::AutofillMergeTest() : DataDrivenTest() {
 }
 
 AutofillMergeTest::~AutofillMergeTest() {
 }
 
 void AutofillMergeTest::SetUp() {
   autofill_test::DisableSystemServices(NULL);
-
-  personal_data_.reset(new PersonalDataManagerMock);
 }
 
 void AutofillMergeTest::GenerateResults(const std::string& input,
                                         std::string* output) {
   MergeProfiles(input, output);
 }
 
 void AutofillMergeTest::MergeProfiles(const std::string& profiles,
                                       std::string* merged_profiles) {
   // Start with no saved profiles.
-  personal_data_->Reset();
+  personal_data_.Reset();
 
   // Create a test form.
   webkit_glue::FormData form;
   form.name = ASCIIToUTF16("MyTestForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("https://www.example.com/origin.html");
   form.action = GURL("https://www.example.com/action.html");
   form.user_submitted = true;
 
   // Parse the input line by line.
@@ skipping 27 matching lines @@
         // into the field's name.
         AutofillField* field =
             const_cast<AutofillField*>(form_structure.field(i));
         AutofillFieldType type =
             AutofillType::StringToFieldType(UTF16ToUTF8(field->name));
         field->set_heuristic_type(type);
       }
 
       // Import the profile.
       const CreditCard* imported_credit_card;
-      personal_data_->ImportFormData(form_structure, &imported_credit_card);
-      EXPECT_FALSE(imported_credit_card);
+      personal_data_.ImportFormData(form_structure, &imported_credit_card);
+      EXPECT_EQ(static_cast<const CreditCard*>(NULL), imported_credit_card);
 
       // Clear the |form| to start a new profile.
       form.fields.clear();
     }
   }
 
-  *merged_profiles = SerializeProfiles(personal_data_->web_profiles());
+  *merged_profiles = SerializeProfiles(personal_data_.web_profiles());
 }
 
 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }