4 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/autofill_manager.cc b/chrome/browser/autofill_manager.cc
index 8284cb4..6b44dd6 100644
--- a/chrome/browser/autofill_manager.cc
+++ b/chrome/browser/autofill_manager.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "webkit/glue/autofill_form.h"
 
 // static
 void AutofillManager::RegisterUserPrefs(PrefService* prefs) {
@@ -114,4 +115,3 @@ void AutofillManager::StoreFormEntriesInWebDatabase(
   profile()->GetWebDataService(Profile::EXPLICIT_ACCESS)->
       AddAutofillFormElements(form.elements);
 }
-
diff --git a/chrome/browser/autofill_manager.h b/chrome/browser/autofill_manager.h
index 3ece658..b3f03f9 100644
--- a/chrome/browser/autofill_manager.h
+++ b/chrome/browser/autofill_manager.h
@@ -10,8 +10,8 @@
 
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/pref_member.h"
-#include "webkit/glue/autofill_form.h"
 
+class AutofillForm;
 class Profile;
 class WebContents;
 
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 28b83db..4769f07 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -228,11 +228,12 @@ void PasswordManager::Autofill(const PasswordForm& form_for_autofill,
       // schemed password form may have been freed, so we need to distinguish.
       bool action_mismatch = form_for_autofill.action.GetWithEmptyPath() !=
                              preferred_match->action.GetWithEmptyPath();
-      scoped_ptr<PasswordFormDomManager::FillData> fill_data(
-          PasswordFormDomManager::CreateFillData(form_for_autofill,
-                                                 best_matches, preferred_match,
-                                                 action_mismatch));
-      web_contents_->render_view_host()->FillPasswordForm(*fill_data);
+      PasswordFormDomManager::FillData fill_data;
+      PasswordFormDomManager::InitFillData(form_for_autofill,
+                                           best_matches, preferred_match,
+                                           action_mismatch,
+                                           &fill_data);
+      web_contents_->render_view_host()->FillPasswordForm(fill_data);
       return;
     }
     default:
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index 764aaa8..c5b25f9 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -10,6 +10,7 @@
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
+#include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"