| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index aef2207674ee7aca7f20337151b20a16de39fe68..d41984845cd18abac091eaae60f4ea775efe443e 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -57,6 +57,7 @@
|
| #include "content/public/renderer/content_renderer_client.h"
|
| #include "content/public/renderer/document_state.h"
|
| #include "content/public/renderer/navigation_state.h"
|
| +#include "content/public/renderer/password_form_conversion_utils.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| #include "content/public/renderer/render_view_visitor.h"
|
| #include "content/renderer/browser_plugin/browser_plugin.h"
|
| @@ -181,9 +182,6 @@
|
| #include "v8/include/v8.h"
|
| #include "webkit/appcache/web_application_cache_host_impl.h"
|
| #include "webkit/dom_storage/dom_storage_types.h"
|
| -#include "webkit/forms/form_data.h"
|
| -#include "webkit/forms/form_field.h"
|
| -#include "webkit/forms/password_form_dom_manager.h"
|
| #include "webkit/glue/alt_error_page_resource_fetcher.h"
|
| #include "webkit/glue/dom_operations.h"
|
| #include "webkit/glue/glue_serialize.h"
|
| @@ -321,6 +319,7 @@ using base::Time;
|
| using base::TimeDelta;
|
| using content::DocumentState;
|
| using content::NavigationState;
|
| +using content::PasswordForm;
|
| using content::Referrer;
|
| using content::RenderThread;
|
| using content::RenderViewObserver;
|
| @@ -328,9 +327,6 @@ using content::RenderViewVisitor;
|
| using content::RendererAccessibilityComplete;
|
| using content::RendererAccessibilityFocusOnly;
|
| using content::V8ValueConverter;
|
| -using webkit::forms::FormField;
|
| -using webkit::forms::PasswordForm;
|
| -using webkit::forms::PasswordFormDomManager;
|
| using webkit_glue::AltErrorPageResourceFetcher;
|
| using webkit_glue::ResourceFetcher;
|
| using webkit_glue::WebPreferences;
|
| @@ -2937,8 +2933,7 @@ void RenderViewImpl::willSendSubmitEvent(WebKit::WebFrame* frame,
|
| // a copy of the password in case it gets lost.
|
| DocumentState* document_state =
|
| DocumentState::FromDataSource(frame->dataSource());
|
| - document_state->set_password_form_data(
|
| - PasswordFormDomManager::CreatePasswordForm(form));
|
| + document_state->set_password_form_data(content::CreatePasswordForm(form));
|
| }
|
|
|
| void RenderViewImpl::willSubmitForm(WebFrame* frame,
|
| @@ -2956,7 +2951,7 @@ void RenderViewImpl::willSubmitForm(WebFrame* frame,
|
| document_state->set_searchable_form_encoding(
|
| web_searchable_form_data.encoding().utf8());
|
| scoped_ptr<PasswordForm> password_form_data =
|
| - PasswordFormDomManager::CreatePasswordForm(form);
|
| + content::CreatePasswordForm(form);
|
|
|
| // In order to save the password that the user actually typed and not one
|
| // that may have gotten transformed by the site prior to submit, recover it
|
|
|