Group forms-related files in webkit/glue in a forms/ subdirectory.

chrome/browser/password_manager/password_manager_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/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
-using webkit_glue::PasswordForm;
+using webkit::forms::PasswordForm;
 using testing::_;
 using testing::DoAll;
 using ::testing::Exactly;
 using ::testing::WithArg;
 using ::testing::Return;
 
 class MockPasswordManagerDelegate : public PasswordManagerDelegate {
  public:
   MOCK_METHOD1(FillPasswordForm, void(
-     const webkit_glue::PasswordFormFillData&));
+     const webkit::forms::PasswordFormFillData&));
   MOCK_METHOD1(AddSavePasswordInfoBar, void(PasswordFormManager*));
   MOCK_METHOD0(GetProfileForPasswordManager, Profile*());
   MOCK_METHOD0(DidLastPageLoadEncounterSSLErrors, bool());
 };
 
 class TestingProfileWithPasswordStore : public TestingProfile {
  public:
   explicit TestingProfileWithPasswordStore(PasswordStore* store)
       : store_(store) {}
   virtual ~TestingProfileWithPasswordStore() {
@@ skipping 16 matching lines @@
   MOCK_METHOD0(ReportMetricsImpl, void());
   MOCK_METHOD1(AddLoginImpl, void(const PasswordForm&));
   MOCK_METHOD1(UpdateLoginImpl, void(const PasswordForm&));
   MOCK_METHOD1(RemoveLoginImpl, void(const PasswordForm&));
   MOCK_METHOD2(RemoveLoginsCreatedBetweenImpl, void(const base::Time&,
                const base::Time&));
   MOCK_METHOD2(GetLoginsImpl, void(GetLoginsRequest*, const PasswordForm&));
   MOCK_METHOD1(GetAutofillableLoginsImpl, void(GetLoginsRequest*));
   MOCK_METHOD1(GetBlacklistLoginsImpl, void(GetLoginsRequest*));
   MOCK_METHOD1(FillAutofillableLogins,
-      bool(std::vector<webkit_glue::PasswordForm*>*));
+      bool(std::vector<webkit::forms::PasswordForm*>*));
   MOCK_METHOD1(FillBlacklistLogins,
-      bool(std::vector<webkit_glue::PasswordForm*>*));
+      bool(std::vector<webkit::forms::PasswordForm*>*));
 };
 
 ACTION_P2(InvokeConsumer, handle, forms) {
   arg0->OnPasswordStoreRequestDone(handle, forms);
 }
 
 ACTION_P(SaveToScopedPtr, scoped) {
   scoped->reset(arg0);
 }
 
@@ skipping 192 matching lines @@
   EXPECT_CALL(*store_, GetLogins(_,_))
       .WillRepeatedly(DoAll(WithArg<1>(InvokeConsumer(0, result)), Return(0)));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
   manager()->OnPasswordFormsFound(observed);  // The initial load.
   // PasswordFormsVisible is not called.
 
   manager()->DidStopLoading();
 }