summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 03:29:03 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 03:29:03 +0000
commit3b073b258b19937b1dd9b6b2a609dee207865eba (patch)
treefb0779236d58e8a49513c1036d891c2e10c9573c /chrome
parent7fb087e0800d0faaa31e4a029ad6813f251b4848 (diff)
downloadchromium_src-3b073b258b19937b1dd9b6b2a609dee207865eba.zip
chromium_src-3b073b258b19937b1dd9b6b2a609dee207865eba.tar.gz
chromium_src-3b073b258b19937b1dd9b6b2a609dee207865eba.tar.bz2
Move all the SSL stuff into its own subdir
Review URL: http://codereview.chromium.org/18137 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/automation/automation_provider.cc4
-rw-r--r--chrome/browser/browser.cc2
-rw-r--r--chrome/browser/browser.scons8
-rw-r--r--chrome/browser/browser.vcproj140
-rw-r--r--chrome/browser/browser_prefs.cc2
-rw-r--r--chrome/browser/ssl/ssl_blocking_page.cc (renamed from chrome/browser/ssl_blocking_page.cc)4
-rw-r--r--chrome/browser/ssl/ssl_blocking_page.h (renamed from chrome/browser/ssl_blocking_page.h)2
-rw-r--r--chrome/browser/ssl/ssl_error_info.cc (renamed from chrome/browser/ssl_error_info.cc)2
-rw-r--r--chrome/browser/ssl/ssl_error_info.h (renamed from chrome/browser/ssl_error_info.h)0
-rw-r--r--chrome/browser/ssl/ssl_manager.cc (renamed from chrome/browser/ssl_manager.cc)6
-rw-r--r--chrome/browser/ssl/ssl_manager.h (renamed from chrome/browser/ssl_manager.h)0
-rw-r--r--chrome/browser/ssl/ssl_policy.cc (renamed from chrome/browser/ssl_policy.cc)4
-rw-r--r--chrome/browser/ssl/ssl_policy.h (renamed from chrome/browser/ssl_policy.h)4
-rw-r--r--chrome/browser/ssl/ssl_uitest.cc (renamed from chrome/browser/ssl_uitest.cc)0
-rw-r--r--chrome/browser/tab_contents/navigation_controller.h2
-rw-r--r--chrome/browser/tab_contents/provisional_load_details.cc2
-rw-r--r--chrome/browser/toolbar_model.cc2
-rw-r--r--chrome/browser/views/page_info_window.cc2
-rw-r--r--chrome/chrome.xcodeproj/project.pbxproj8
-rw-r--r--chrome/test/ui/ui_tests.vcproj2
20 files changed, 136 insertions, 60 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 0f12952..c014b8f 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -21,8 +21,8 @@
#include "chrome/browser/login_prompt.h"
#include "chrome/browser/printing/print_job.h"
#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/ssl_manager.h"
-#include "chrome/browser/ssl_blocking_page.h"
+#include "chrome/browser/ssl/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_blocking_page.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/web_contents.h"
#include "chrome/browser/tab_contents/web_contents_view.h"
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 94214d6..78ca6aad 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -32,7 +32,7 @@
#include "chrome/browser/plugin_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/sessions/session_service.h"
-#include "chrome/browser/ssl_error_info.h"
+#include "chrome/browser/ssl/ssl_error_info.h"
#include "chrome/browser/tab_contents/interstitial_page.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 490ed65..156903b 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -124,7 +124,7 @@ if not env.Bit('mac'):
'sessions/session_id.cc',
'spellcheck_worditerator.cc',
'spellchecker.cc',
- 'ssl_error_info.cc',
+ 'ssl/ssl_error_info.cc',
'url_fetcher.cc',
'url_fetcher_protect.cc',
'webdata/web_database.cc',
@@ -268,9 +268,9 @@ if env.Bit('windows'):
'sessions/session_types.cc',
'sessions/tab_restore_service.cc',
'shell_integration.cc',
- 'ssl_blocking_page.cc',
- 'ssl_manager.cc',
- 'ssl_policy.cc',
+ 'ssl/ssl_blocking_page.cc',
+ 'ssl/ssl_manager.cc',
+ 'ssl/ssl_policy.cc',
'tab_contents/about_internets_status_view.cc',
'tab_contents/infobar_delegate.cc',
'tab_contents/interstitial_page.cc',
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 5538417..8d6da23 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -753,22 +753,6 @@
RelativePath=".\security_style.h"
>
</File>
- <File
- RelativePath=".\ssl_error_info.cc"
- >
- </File>
- <File
- RelativePath=".\ssl_error_info.h"
- >
- </File>
- <File
- RelativePath=".\ssl_manager.cc"
- >
- </File>
- <File
- RelativePath=".\ssl_manager.h"
- >
- </File>
</Filter>
<Filter
Name="Browser Window"
@@ -917,14 +901,6 @@
RelativePath=".\renderer_security_policy.h"
>
</File>
- <File
- RelativePath=".\ssl_policy.cc"
- >
- </File>
- <File
- RelativePath=".\ssl_policy.h"
- >
- </File>
</Filter>
<Filter
Name="Destination"
@@ -2648,6 +2624,114 @@
>
</File>
</Filter>
+ <Filter
+ Name="SSL"
+ >
+ <File
+ RelativePath=".\ssl\ssl_blocking_page.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=".\ssl\ssl_blocking_page.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ssl\ssl_error_info.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=".\ssl\ssl_error_info.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ssl\ssl_manager.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=".\ssl\ssl_manager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ssl\ssl_policy.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=".\ssl\ssl_policy.h"
+ >
+ </File>
+ </Filter>
<File
RelativePath=".\browser_trial.cc"
>
@@ -2733,14 +2817,6 @@
>
</File>
<File
- RelativePath=".\ssl_blocking_page.cc"
- >
- </File>
- <File
- RelativePath=".\ssl_blocking_page.h"
- >
- </File>
- <File
RelativePath=".\toolbar_model.cc"
>
</File>
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index db4abb0..2cf949b 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -16,7 +16,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/session_startup_pref.h"
#include "chrome/browser/spellchecker.h"
-#include "chrome/browser/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/task_manager.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
diff --git a/chrome/browser/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index 67ea40a..96d0003 100644
--- a/chrome/browser/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ssl_blocking_page.h"
+#include "chrome/browser/ssl/ssl_blocking_page.h"
#include "base/string_piece.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_resources.h"
#include "chrome/browser/cert_store.h"
#include "chrome/browser/dom_operation_notification_details.h"
-#include "chrome/browser/ssl_error_info.h"
+#include "chrome/browser/ssl/ssl_error_info.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/web_contents.h"
diff --git a/chrome/browser/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h
index 69472fa..c3c2289 100644
--- a/chrome/browser/ssl_blocking_page.h
+++ b/chrome/browser/ssl/ssl_blocking_page.h
@@ -8,7 +8,7 @@
#include <string>
#include "chrome/browser/tab_contents/interstitial_page.h"
-#include "chrome/browser/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/views/decision.h"
// This class is responsible for showing/hiding the interstitial page that is
diff --git a/chrome/browser/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc
index 55fe353..ee12ae1 100644
--- a/chrome/browser/ssl_error_info.cc
+++ b/chrome/browser/ssl/ssl_error_info.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/ssl_error_info.h"
+#include "chrome/browser/ssl/ssl_error_info.h"
#include "base/string_util.h"
#include "chrome/browser/cert_store.h"
diff --git a/chrome/browser/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h
index c7d6698..c7d6698 100644
--- a/chrome/browser/ssl_error_info.h
+++ b/chrome/browser/ssl/ssl_error_info.h
diff --git a/chrome/browser/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index a91b248..b2fd246 100644
--- a/chrome/browser/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_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/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_manager.h"
#include "base/message_loop.h"
#include "base/string_util.h"
@@ -12,8 +12,8 @@
#include "chrome/browser/load_from_memory_cache_details.h"
#include "chrome/browser/render_view_host.h"
#include "chrome/browser/resource_request_details.h"
-#include "chrome/browser/ssl_error_info.h"
-#include "chrome/browser/ssl_policy.h"
+#include "chrome/browser/ssl/ssl_error_info.h"
+#include "chrome/browser/ssl/ssl_policy.h"
#include "chrome/browser/tab_contents/infobar_delegate.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h
index e650b35..e650b35 100644
--- a/chrome/browser/ssl_manager.h
+++ b/chrome/browser/ssl/ssl_manager.h
diff --git a/chrome/browser/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index ea92e37..e857244 100644
--- a/chrome/browser/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.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/ssl_policy.h"
+#include "chrome/browser/ssl/ssl_policy.h"
#include "base/singleton.h"
#include "base/string_piece.h"
@@ -10,7 +10,7 @@
#include "chrome/browser/browser_resources.h"
#include "chrome/browser/cert_store.h"
#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/ssl_error_info.h"
+#include "chrome/browser/ssl/ssl_error_info.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/web_contents.h"
diff --git a/chrome/browser/ssl_policy.h b/chrome/browser/ssl/ssl_policy.h
index f3082bd..d317b63 100644
--- a/chrome/browser/ssl_policy.h
+++ b/chrome/browser/ssl/ssl_policy.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_SSL_POLICY_H__
#define CHROME_BROWSER_SSL_POLICY_H__
-#include "chrome/browser/ssl_blocking_page.h"
-#include "chrome/browser/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_blocking_page.h"
+#include "chrome/browser/ssl/ssl_manager.h"
// The basic SSLPolicy. This class contains default implementations of all
// the SSLPolicy entry points. It is expected that subclasses will override
diff --git a/chrome/browser/ssl_uitest.cc b/chrome/browser/ssl/ssl_uitest.cc
index 2a84744..2a84744 100644
--- a/chrome/browser/ssl_uitest.cc
+++ b/chrome/browser/ssl/ssl_uitest.cc
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index dac0a37..113041d 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -10,7 +10,7 @@
#include "base/linked_ptr.h"
#include "base/ref_counted.h"
#include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/browser/tab_contents/site_instance.h"
#include "chrome/browser/tab_contents/tab_contents_type.h"
#include "chrome/common/navigation_types.h"
diff --git a/chrome/browser/tab_contents/provisional_load_details.cc b/chrome/browser/tab_contents/provisional_load_details.cc
index 1ec1206..8664569 100644
--- a/chrome/browser/tab_contents/provisional_load_details.cc
+++ b/chrome/browser/tab_contents/provisional_load_details.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/tab_contents/provisional_load_details.h"
-#include "chrome/browser/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_manager.h"
ProvisionalLoadDetails::ProvisionalLoadDetails(bool is_main_frame,
bool is_in_page_navigation,
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc
index ba40deb..c1579fd 100644
--- a/chrome/browser/toolbar_model.cc
+++ b/chrome/browser/toolbar_model.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/toolbar_model.h"
#include "chrome/browser/cert_store.h"
-#include "chrome/browser/ssl_error_info.h"
+#include "chrome/browser/ssl/ssl_error_info.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc
index fdd32fb..e919851 100644
--- a/chrome/browser/views/page_info_window.cc
+++ b/chrome/browser/views/page_info_window.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/cert_store.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/profile.h"
-#include "chrome/browser/ssl_manager.h"
+#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/browser/views/standard_layout.h"
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 1088f4b..289f701 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -285,7 +285,6 @@
E45075F40F150C01003BE099 /* session_command.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075F30F150C01003BE099 /* session_command.cc */; };
E45075F70F150C0C003BE099 /* session_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075F60F150C0C003BE099 /* session_id.cc */; };
E45075FA0F150C28003BE099 /* spellcheck_worditerator.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9220E9D4839009A6919 /* spellcheck_worditerator.cc */; };
- E45075FF0F150C84003BE099 /* ssl_error_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9280E9D4839009A6919 /* ssl_error_info.cc */; };
E450761A0F150DE9003BE099 /* url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9510E9D4839009A6919 /* url_fetcher.cc */; };
E45076200F150E0C003BE099 /* web_database.cc in Sources */ = {isa = PBXBuildFile; fileRef = E450761E0F150E0C003BE099 /* web_database.cc */; };
E45076850F1530CD003BE099 /* pref_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBEA0E9D4C9F009A6919 /* pref_service.cc */; };
@@ -328,6 +327,7 @@
E4F3258C0EE83767002533CE /* libgoogleurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFF6E0E9D540F009A6919 /* libgoogleurl.a */; };
E4F325C80EE83A45002533CE /* ipc_fuzzing_tests.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBAD0E9D4C9F009A6919 /* ipc_fuzzing_tests.cc */; };
E4F325D10EE83B71002533CE /* ipc_tests.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBBE0E9D4C9F009A6919 /* ipc_tests.cc */; };
+ F775995035B63E51251B0922 /* ssl_error_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = 26D97CE692D919FEB1521E43 /* ssl_error_info.cc */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -1169,7 +1169,6 @@
4D7BF9250E9D4839009A6919 /* spellchecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spellchecker.h; sourceTree = "<group>"; };
4D7BF9260E9D4839009A6919 /* ssl_blocking_page.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ssl_blocking_page.cc; sourceTree = "<group>"; };
4D7BF9270E9D4839009A6919 /* ssl_blocking_page.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl_blocking_page.h; sourceTree = "<group>"; };
- 4D7BF9280E9D4839009A6919 /* ssl_error_info.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ssl_error_info.cc; sourceTree = "<group>"; };
4D7BF9290E9D4839009A6919 /* ssl_error_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl_error_info.h; sourceTree = "<group>"; };
4D7BF92A0E9D4839009A6919 /* ssl_manager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ssl_manager.cc; sourceTree = "<group>"; };
4D7BF92B0E9D4839009A6919 /* ssl_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl_manager.h; sourceTree = "<group>"; };
@@ -1732,6 +1731,7 @@
EA72C084DB3FC0FC595E525E /* template_url_model.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = template_url_model.cc; path = browser/search_engines/template_url_model.cc; sourceTree = SOURCE_ROOT; };
EFB2D9BDD612A100477ECCBD /* user_metrics.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = user_metrics.cc; path = browser/metrics/user_metrics.cc; sourceTree = SOURCE_ROOT; };
F145A671557D09F55DCD580A /* metrics_response_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = metrics_response_unittest.cc; path = browser/metrics/metrics_response_unittest.cc; sourceTree = SOURCE_ROOT; };
+ 26D97CE692D919FEB1521E43 /* ssl_error_info.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ssl_error_info.cc; path = browser/ssl/ssl_error_info.cc; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -1952,6 +1952,7 @@
DD32402B093835283164616B /* user_metrics.h */,
187598100CC57B863A3BDD57 /* metrics_log_unittest.cc */,
F145A671557D09F55DCD580A /* metrics_response_unittest.cc */,
+ 26D97CE692D919FEB1521E43 /* ssl_error_info.cc */,
);
sourceTree = "<group>";
};
@@ -2204,7 +2205,6 @@
4D7BF9250E9D4839009A6919 /* spellchecker.h */,
4D7BF9260E9D4839009A6919 /* ssl_blocking_page.cc */,
4D7BF9270E9D4839009A6919 /* ssl_blocking_page.h */,
- 4D7BF9280E9D4839009A6919 /* ssl_error_info.cc */,
4D7BF9290E9D4839009A6919 /* ssl_error_info.h */,
4D7BF92A0E9D4839009A6919 /* ssl_manager.cc */,
4D7BF92B0E9D4839009A6919 /* ssl_manager.h */,
@@ -3719,7 +3719,7 @@
4D7BF9B60E9D4894009A6919 /* session_startup_pref.cc in Sources */,
4D7BFA2D0E9D4910009A6919 /* snippet.cc in Sources */,
E45075FA0F150C28003BE099 /* spellcheck_worditerator.cc in Sources */,
- E45075FF0F150C84003BE099 /* ssl_error_info.cc in Sources */,
+ F775995035B63E51251B0922 /* ssl_error_info.cc in Sources */,
E4F3245D0EE5CFDF002533CE /* starred_url_database.cc in Sources */,
E45075EE0F150ABA003BE099 /* sync_resource_handler.cc in Sources */,
9A1EE0F9187ACE2DCB8512E1 /* template_url.cc in Sources */,
diff --git a/chrome/test/ui/ui_tests.vcproj b/chrome/test/ui/ui_tests.vcproj
index e4c7c14..e225613 100644
--- a/chrome/test/ui/ui_tests.vcproj
+++ b/chrome/test/ui/ui_tests.vcproj
@@ -438,7 +438,7 @@
Name="TestSSL"
>
<File
- RelativePath="..\..\browser\ssl_uitest.cc"
+ RelativePath="..\..\browser\ssl\ssl_uitest.cc"
>
</File>
</Filter>