Move password manager files into a subdir

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

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

19 files changed, 51 insertions, 24 deletions

diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 3b0348b..e244d35 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -1678,27 +1678,53 @@
 			Name="Password Manager"
 			>
 			<File
-				RelativePath=".\ie7_password.cc"
+				RelativePath=".\password_manager\encryptor.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\password_manager\encryptor.h"
+				>
+			</File>
+			<File
+				RelativePath=".\password_manager\ie7_password.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\ie7_password.h"
+				RelativePath=".\password_manager\ie7_password.h"
 				>
 			</File>
 			<File
-				RelativePath=".\password_form_manager.cc"
+				RelativePath=".\password_manager\password_form_manager.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\password_form_manager.h"
+				RelativePath=".\password_manager\password_form_manager.h"
 				>
 			</File>
 			<File
-				RelativePath=".\password_manager.cc"
+				RelativePath=".\password_manager\password_manager.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\password_manager.h"
+				RelativePath=".\password_manager\password_manager.h"
 				>
 			</File>
 		</Filter>
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 6946fa8..abbf875 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/metrics_service.h"
-#include "chrome/browser/password_manager.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/spellchecker.h"
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 1c772f3..55bed64 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -18,7 +18,7 @@
 #include "base/time.h"
 #include "base/win_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/ie7_password.h"
+#include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index f7190e9..df13150 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -16,7 +16,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history_types.h"
 #if defined(OS_WIN)
-#include "chrome/browser/ie7_password.h"
+#include "chrome/browser/password_manager/ie7_password.h"
 #endif
 #include "chrome/browser/profile.h"
 #include "chrome/browser/template_url.h"
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index abd93c5..6a24f42 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -15,9 +15,9 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "chrome/browser/ie7_password.h"
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/importer/importer.h"
+#include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc
index 3910019..377753f 100644
--- a/chrome/browser/login_prompt.cc
+++ b/chrome/browser/login_prompt.cc
@@ -9,7 +9,7 @@
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/controller.h"
-#include "chrome/browser/password_manager.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
diff --git a/chrome/browser/encryptor.cc b/chrome/browser/password_manager/encryptor.cc
index a9d467f..b5c0755 100644
--- a/chrome/browser/encryptor.cc
+++ b/chrome/browser/password_manager/encryptor.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/encryptor.h"
+#include "chrome/browser/password_manager/encryptor.h"
 
 #include <windows.h>
 #include <wincrypt.h>
diff --git a/chrome/browser/encryptor.h b/chrome/browser/password_manager/encryptor.h
index 7233960..7233960 100644
--- a/chrome/browser/encryptor.h
+++ b/chrome/browser/password_manager/encryptor.h
diff --git a/chrome/browser/encryptor_unittest.cc b/chrome/browser/password_manager/encryptor_unittest.cc
index 9f1dd54..a1bbd36 100644
--- a/chrome/browser/encryptor_unittest.cc
+++ b/chrome/browser/password_manager/encryptor_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/encryptor.h"
+#include "chrome/browser/password_manager/encryptor.h"
+
 #include <string>
 
 #include "base/string_util.h"
diff --git a/chrome/browser/ie7_password.cc b/chrome/browser/password_manager/ie7_password.cc
index 46e2275..c448f92 100644
--- a/chrome/browser/ie7_password.cc
+++ b/chrome/browser/password_manager/ie7_password.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ie7_password.h"
+#include "chrome/browser/password_manager/ie7_password.h"
 
 #include <wincrypt.h>
 #include <string>
diff --git a/chrome/browser/ie7_password.h b/chrome/browser/password_manager/ie7_password.h
index c90b8e2..c90b8e2 100644
--- a/chrome/browser/ie7_password.h
+++ b/chrome/browser/password_manager/ie7_password.h
diff --git a/chrome/browser/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index 099906d..757dc63 100644
--- a/chrome/browser/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/password_form_manager.h"
+#include "chrome/browser/password_manager/password_form_manager.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
-#include "chrome/browser/ie7_password.h"
-#include "chrome/browser/password_manager.h"
+#include "chrome/browser/password_manager/ie7_password.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_form_manager.h b/chrome/browser/password_manager/password_form_manager.h
index 9d0d8a6..9d0d8a6 100644
--- a/chrome/browser/password_form_manager.h
+++ b/chrome/browser/password_manager/password_form_manager.h
diff --git a/chrome/browser/password_form_manager_unittest.cc b/chrome/browser/password_manager/password_form_manager_unittest.cc
index 92432d3..ffcee20 100644
--- a/chrome/browser/password_form_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_form_manager_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "chrome/browser/password_form_manager.h"
-#include "chrome/browser/password_manager.h"
+#include "chrome/browser/password_manager/password_form_manager.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/test/testing_profile.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/browser/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index fa19f62..4187151 100644
--- a/chrome/browser/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -2,7 +2,7 @@
 // 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.h"
+#include "chrome/browser/password_manager/password_manager.h"
 
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
diff --git a/chrome/browser/password_manager.h b/chrome/browser/password_manager/password_manager.h
index dd9a953..74c5554 100644
--- a/chrome/browser/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_PASSWORD_MANAGER_H__
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/password_form_manager.h"
+#include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/pref_member.h"
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index e3e3f44..d736ac4 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/ie7_password.h"
+#include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/common/chrome_constants.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index ced6eb8..5998282 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -14,8 +14,8 @@
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/history/history_database.h"
+#include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/template_url.h"
-#include "chrome/browser/encryptor.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/scoped_vector.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/browser/webdata/web_database_win.cc b/chrome/browser/webdata/web_database_win.cc
index f5793d4..4bfcc02 100644
--- a/chrome/browser/webdata/web_database_win.cc
+++ b/chrome/browser/webdata/web_database_win.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/time.h"
-#include "chrome/browser/ie7_password.h"
+#include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/common/sqlite_utils.h"
 
 bool WebDatabase::AddIE7Login(const IE7PasswordInfo& info) {