Make password generation switched by a preference in chrome settings rather than a command line fla…

chrome/browser/autofill/autofill_external_delegate_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 <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_manager.h"
@@ skipping 38 matching lines @@
   MOCK_METHOD0(ClearPreviewedForm, void());
 
   MOCK_METHOD0(HideAutofillPopup, void());
 
  private:
   virtual void HideAutofillPopupInternal() {};
 };
 
 class MockAutofillManager : public AutofillManager {
  public:
-  explicit MockAutofillManager(TabContentsWrapper* tab_contents)
-      : AutofillManager(tab_contents) {}
+  MockAutofillManager(TabContentsWrapper* tab_contents,
+                      PersonalDataManager* personal_data)
+      : AutofillManager(tab_contents, personal_data) {}

[Ilya Sherman, 2012/05/16 18:10:38]

nit: Rather than adding a new parameter for |personal_data|, just pass NULL as
the second argument to the AutofillManager constructor, since that's what all
the tests in this file want.

[zysxqn, 2012/05/16 18:25:03]

Done.

 
   MOCK_METHOD4(OnFillAutofillFormData,
                void(int query_id,
                     const webkit::forms::FormData& form,
                     const webkit::forms::FormField& field,
                     int unique_id));
 
  protected:
   virtual ~MockAutofillManager() {}
 };
 
 }  // namespace
 
 class AutofillExternalDelegateUnitTest : public TabContentsWrapperTestHarness {
  public:
   AutofillExternalDelegateUnitTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {}
   virtual ~AutofillExternalDelegateUnitTest() {}
 
   virtual void SetUp() OVERRIDE {
     TabContentsWrapperTestHarness::SetUp();
-    autofill_manager_ = new MockAutofillManager(contents_wrapper());
+    // Force to use the constructor designated for unit test, but we don't
+    // really need personal_data in this test so we pass a NULL pointer.
+    autofill_manager_ = new MockAutofillManager(contents_wrapper(), NULL);
     external_delegate_.reset(new MockAutofillExternalDelegate(
         contents_wrapper(),
         autofill_manager_));
   }
 
  protected:
   scoped_refptr<MockAutofillManager> autofill_manager_;
   scoped_ptr<MockAutofillExternalDelegate> external_delegate_;
 
  private:
@@ skipping 71 matching lines @@
   external_delegate_->SelectAutofillSuggestionAtIndex(1);
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
 TEST_F(AutofillExternalDelegateUnitTest,
        ExternalDelegateHidePopupAfterEditing) {
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   external_delegate_->DidEndTextFieldEditing();
 }