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

chrome/browser/password_manager/password_manager.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/password_manager/password_manager.h"
 
 #include "app/l10n_util.h"
 #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"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
@@ skipping 206 matching lines @@
                              preferred_match->action.GetWithEmptyPath();
       PasswordFormDomManager::FillData fill_data;
       PasswordFormDomManager::InitFillData(form_for_autofill,
                                            best_matches, preferred_match,
                                            action_mismatch,
                                            &fill_data);
       tab_contents_->render_view_host()->FillPasswordForm(fill_data);
       return;
     }
     default:
-      if (observer_)
+      if (observer_) {
         observer_->OnAutofillDataAvailable(preferred_match->username_value,
                                            preferred_match->password_value);
+      }
   }
 }