Make password_manager.cc compile on Posix.

Review URL: http://codereview.chromium.org/20383

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9833 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 12 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 45106bd..73d6356 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -725,7 +725,6 @@ if not env.Bit('windows'):
       'net/dns_slave.cc',
       'google_update.cc',
       'password_manager/encryptor.cc',
-      'password_manager/password_manager.cc',
       'plugin_installer.cc',
       'plugin_process_host.cc',
       'plugin_service.cc',
diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index 43120cc..138b713 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -6,14 +6,8 @@
 
 #include <algorithm>
 
-#if defined(OS_POSIX)
-// TODO(port): remove these when supporting classes are ported
-#include "chrome/common/temp_scaffolding_stubs.h"
-#elif defined(OS_WIN)
-#include "chrome/browser/password_manager/password_manager.h"
-#endif
-
 #include "base/string_util.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profile.h"
 #include "webkit/glue/password_form_dom_manager.h"
 
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 4769f07..1b67d72 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -88,9 +88,9 @@ void PasswordManager::RegisterUserPrefs(PrefService* prefs) {
 }
 
 PasswordManager::PasswordManager(WebContents* web_contents)
-    : web_contents_(web_contents),
-      observer_(NULL),
-      login_managers_deleter_(&pending_login_managers_) {
+    : login_managers_deleter_(&pending_login_managers_),
+      web_contents_(web_contents),
+      observer_(NULL) {
   password_manager_enabled_.Init(prefs::kPasswordManagerEnabled,
       web_contents->profile()->GetPrefs(), NULL);
 }
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 5920056..95ca5b7 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/jsmessage_box_handler.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/load_notification_details.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -45,7 +46,6 @@
 #include "chrome/browser/download/download_request_manager.h"
 #include "chrome/browser/gears_integration.h"
 #include "chrome/browser/modal_html_dialog_delegate.h"
-#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job.h"