Re-land the password store work from bug 8205, with changes that should fix b...

chrome/browser/password_manager/password_manager.cc

Index: chrome/browser/password_manager/password_manager.cc
===================================================================
--- chrome/browser/password_manager/password_manager.cc	(revision 17245)
+++ chrome/browser/password_manager/password_manager.cc	(working copy)
@@ -8,6 +8,7 @@
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
@@ -234,8 +235,9 @@
       return;
     }
     default:
-      if (observer_)
+      if (observer_) {
         observer_->OnAutofillDataAvailable(preferred_match->username_value,
                                            preferred_match->password_value);
+      }
   }
 }