diff options
40 files changed, 130 insertions, 76 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.h b/chrome/browser/alternate_nav_url_fetcher.h index d02480c..ccf10a4 100644 --- a/chrome/browser/alternate_nav_url_fetcher.h +++ b/chrome/browser/alternate_nav_url_fetcher.h @@ -7,8 +7,8 @@ #include <string> +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/url_fetcher.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index f0e16e3..3100319 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -14,8 +14,8 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/history_tab_ui.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 22f1574..4c4da0e 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -21,11 +21,11 @@ #include "chrome/browser/controller.h" #include "chrome/browser/drag_utils.h" #include "chrome/browser/metrics/user_metrics.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/clipboard_service.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index 0737036..3cb0a84 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -12,8 +12,8 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_database.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index d302b30..b160bb5 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -8,9 +8,9 @@ #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google_util.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h index 687ea07..bda313d 100644 --- a/chrome/browser/autocomplete/search_provider.h +++ b/chrome/browser/autocomplete/search_provider.h @@ -17,8 +17,8 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/browser/url_fetcher.h" class Profile; class Value; diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 78ca6aad..64d3ef5 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -28,6 +28,7 @@ #include "chrome/browser/history_tab_ui.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/options_window.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/plugin_process_host.h" #include "chrome/browser/plugin_service.h" #include "chrome/browser/profile.h" @@ -39,7 +40,6 @@ #include "chrome/browser/tab_contents/site_instance.h" #include "chrome/browser/tab_contents/web_contents_view.h" #include "chrome/browser/task_manager.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/download_tab_view.h" diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 0d26151..8f60fb4 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -95,6 +95,8 @@ if not env.Bit('mac'): 'net/dns_host_info.cc', 'net/referrer.cc', 'net/sdch_dictionary_fetcher.cc', + 'net/url_fetcher.cc', + 'net/url_fetcher_protect.cc', 'page_state.cc', 'printing/page_number.cc', 'printing/page_range.cc', @@ -125,8 +127,6 @@ if not env.Bit('mac'): 'spellcheck_worditerator.cc', 'spellchecker.cc', 'ssl/ssl_error_info.cc', - 'url_fetcher.cc', - 'url_fetcher_protect.cc', 'webdata/web_database.cc', ]) @@ -223,6 +223,7 @@ if env.Bit('windows'): 'net/dns_global.cc', 'net/dns_master.cc', 'net/dns_slave.cc', + 'net/url_fixer_upper.cc', 'google_update.cc', 'password_manager/encryptor.cc', 'password_manager/ie7_password.cc', @@ -295,7 +296,6 @@ if env.Bit('windows'): 'task_manager.cc', 'task_manager_resource_providers.cc', 'toolbar_model.cc', - 'url_fixer_upper.cc', 'user_data_manager.cc', 'visitedlink_master.cc', 'web_app.cc', diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index 5cc8fe9..583d4b4 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -570,30 +570,6 @@ > </File> <File - RelativePath=".\url_fetcher.cc" - > - </File> - <File - RelativePath=".\url_fetcher.h" - > - </File> - <File - RelativePath=".\url_fetcher_protect.cc" - > - </File> - <File - RelativePath=".\url_fetcher_protect.h" - > - </File> - <File - RelativePath=".\url_fixer_upper.cc" - > - </File> - <File - RelativePath=".\url_fixer_upper.h" - > - </File> - <File RelativePath=".\user_data_manager.cc" > </File> @@ -1759,6 +1735,84 @@ RelativePath=".\net\sdch_dictionary_fetcher.h" > </File> + <File + RelativePath=".\net\url_fetcher.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=".\net\url_fetcher.h" + > + </File> + <File + RelativePath=".\net\url_fetcher_protect.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=".\net\url_fetcher_protect.h" + > + </File> + <File + RelativePath=".\net\url_fixer_upper.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=".\net\url_fixer_upper.h" + > + </File> </Filter> <Filter Name="RLZ" diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 24a77f2..3ea9b88 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -25,12 +25,12 @@ #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/first_run.h" #include "chrome/browser/net/dns_global.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/session_startup_pref.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/web_app_launcher.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index c95acae..2645013 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -70,9 +70,9 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/dns_global.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/rlz/rlz.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/views/user_data_dir_dialog.h" #include "chrome/common/env_vars.h" diff --git a/chrome/browser/google_url_tracker.h b/chrome/browser/google_url_tracker.h index e270397..b3f1795 100644 --- a/chrome/browser/google_url_tracker.h +++ b/chrome/browser/google_url_tracker.h @@ -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/url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/common/notification_service.h" class PrefService; diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h index 0a1c601..cfb2825 100644 --- a/chrome/browser/importer/toolbar_importer.h +++ b/chrome/browser/importer/toolbar_importer.h @@ -12,7 +12,7 @@ #include <vector> #include "chrome/browser/importer/importer.h" -#include "chrome/browser/url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" class XmlReader; diff --git a/chrome/browser/login_prompt_uitest.cc b/chrome/browser/login_prompt_uitest.cc index 1d7d25c..47d046b 100644 --- a/chrome/browser/login_prompt_uitest.cc +++ b/chrome/browser/login_prompt_uitest.cc @@ -4,7 +4,7 @@ #include <string> -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h index f0f69ed..17669ee 100644 --- a/chrome/browser/metrics/metrics_service.h +++ b/chrome/browser/metrics/metrics_service.h @@ -20,7 +20,7 @@ #include "base/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/metrics/metrics_log.h" -#include "chrome/browser/url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/common/notification_service.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h index b2169b8..b943a24 100644 --- a/chrome/browser/net/sdch_dictionary_fetcher.h +++ b/chrome/browser/net/sdch_dictionary_fetcher.h @@ -14,7 +14,7 @@ #include "base/compiler_specific.h" #include "base/task.h" -#include "chrome/browser/url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" #include "net/base/sdch_manager.h" class SdchDictionaryFetcher : public URLFetcher::Delegate, diff --git a/chrome/browser/url_fetcher.cc b/chrome/browser/net/url_fetcher.cc index 313ae73..b7ea8cd 100644 --- a/chrome/browser/url_fetcher.cc +++ b/chrome/browser/net/url_fetcher.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/url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" #include "base/compiler_specific.h" #include "base/string_util.h" diff --git a/chrome/browser/url_fetcher.h b/chrome/browser/net/url_fetcher.h index b68b53c..7e4c132 100644 --- a/chrome/browser/url_fetcher.h +++ b/chrome/browser/net/url_fetcher.h @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" -#include "chrome/browser/url_fetcher_protect.h" +#include "chrome/browser/net/url_fetcher_protect.h" #include "net/url_request/url_request.h" class URLRequestContext; diff --git a/chrome/browser/url_fetcher_protect.cc b/chrome/browser/net/url_fetcher_protect.cc index b19be608..5b7b208 100644 --- a/chrome/browser/url_fetcher_protect.cc +++ b/chrome/browser/net/url_fetcher_protect.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/url_fetcher_protect.h" +#include "chrome/browser/net/url_fetcher_protect.h" // URLFetcherProtectEntry ---------------------------------------------------- diff --git a/chrome/browser/url_fetcher_protect.h b/chrome/browser/net/url_fetcher_protect.h index 794418b..794418b 100644 --- a/chrome/browser/url_fetcher_protect.h +++ b/chrome/browser/net/url_fetcher_protect.h diff --git a/chrome/browser/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc index 4008de0..50e24fe 100644 --- a/chrome/browser/url_fetcher_unittest.cc +++ b/chrome/browser/net/url_fetcher_unittest.cc @@ -4,8 +4,8 @@ #include "base/thread.h" #include "base/time.h" -#include "chrome/browser/url_fetcher.h" -#include "chrome/browser/url_fetcher_protect.h" +#include "chrome/browser/net/url_fetcher.h" +#include "chrome/browser/net/url_fetcher_protect.h" #if defined(OS_LINUX) // TODO(port): ugly hack for linux namespace ChromePluginLib { diff --git a/chrome/browser/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index 8ad4fbb..1aca150 100644 --- a/chrome/browser/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -5,7 +5,7 @@ #include <algorithm> #include <windows.h> -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "base/file_util.h" #include "base/logging.h" diff --git a/chrome/browser/url_fixer_upper.h b/chrome/browser/net/url_fixer_upper.h index c7f3f00..c7f3f00 100644 --- a/chrome/browser/url_fixer_upper.h +++ b/chrome/browser/net/url_fixer_upper.h diff --git a/chrome/browser/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc index 111874b..024060c 100644 --- a/chrome/browser/url_fixer_upper_unittest.cc +++ b/chrome/browser/net/url_fixer_upper_unittest.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_paths.h" #include "googleurl/src/url_parse.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 62c392f..988ab3a 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -17,7 +17,7 @@ #include "base/hash_tables.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "chrome/browser/url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/safe_browsing/chunk_range.h" #include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" diff --git a/chrome/browser/search_engines/template_url_fetcher.h b/chrome/browser/search_engines/template_url_fetcher.h index a07277f..76917ca 100644 --- a/chrome/browser/search_engines/template_url_fetcher.h +++ b/chrome/browser/search_engines/template_url_fetcher.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_TEMPLATE_URL_FETCHER_H__ #define CHROME_BROWSER_TEMPLATE_URL_FETCHER_H__ +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/profile.h" -#include "chrome/browser/url_fetcher.h" #include "chrome/common/scoped_vector.h" class GURL; diff --git a/chrome/browser/spellchecker.cc b/chrome/browser/spellchecker.cc index b8a7bc7..f5ab257 100644 --- a/chrome/browser/spellchecker.cc +++ b/chrome/browser/spellchecker.cc @@ -13,8 +13,8 @@ #include "base/thread.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/profile.h" -#include "chrome/browser/url_fetcher.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_counters.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index eccca6d..8b701f9 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -10,7 +10,7 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index cf0a74e..bf43013 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -9,12 +9,12 @@ #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_util.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" -#include "chrome/browser/url_fetcher.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h index 82582c3..9ee7733 100644 --- a/chrome/browser/views/bug_report_view.h +++ b/chrome/browser/views/bug_report_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H__ #define CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H__ -#include "chrome/browser/url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/views/combo_box.h" #include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index af98b7f..1c3c95f 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -7,10 +7,10 @@ #include "base/string_util.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/metrics/user_metrics.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index a7964f6..e819b1e 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -14,12 +14,12 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/session_startup_pref.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/shell_integration.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/standard_layout.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index 377eca2..87b1b49 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -8,9 +8,9 @@ #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/app/theme/theme_resources.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index f555e7e..cfbce55 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -92,7 +92,6 @@ 4D7BF9AC0E9D4880009A6919 /* page_state.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8D40E9D4839009A6919 /* page_state.cc */; }; 4D7BF9B10E9D4888009A6919 /* renderer_security_policy.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8FB0E9D4839009A6919 /* renderer_security_policy.cc */; }; 4D7BF9B60E9D4894009A6919 /* session_startup_pref.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF91A0E9D4839009A6919 /* session_startup_pref.cc */; }; - 4D7BF9BD0E9D489B009A6919 /* url_fetcher_protect.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9530E9D4839009A6919 /* url_fetcher_protect.cc */; }; 4D7BF9E10E9D48D6009A6919 /* save_file.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9D40E9D48CE009A6919 /* save_file.cc */; }; 4D7BFA1E0E9D48FD009A6919 /* archived_database.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9E40E9D48F7009A6919 /* archived_database.cc */; }; 4D7BFA1F0E9D4901009A6919 /* history_types.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9F60E9D48F7009A6919 /* history_types.cc */; }; @@ -285,7 +284,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 */; }; - 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 */; }; E45076A90F153619003BE099 /* resource_dispatcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBF60E9D4C9F009A6919 /* resource_dispatcher.cc */; }; @@ -333,6 +331,8 @@ 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 */; }; + 8F51B73AAAF1772ECF9BD180 /* url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 778D7927798B7E3FAA498D3D /* url_fetcher.cc */; }; + 3AEA44DB19C9D93B63D7A2E4 /* url_fetcher_protect.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0B7CC9C105E90E0665852528 /* url_fetcher_protect.cc */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1196,10 +1196,6 @@ 4D7BF94E0E9D4839009A6919 /* template_url_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = template_url_unittest.cc; sourceTree = "<group>"; }; 4D7BF94F0E9D4839009A6919 /* toolbar_model.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = toolbar_model.cc; sourceTree = "<group>"; }; 4D7BF9500E9D4839009A6919 /* toolbar_model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toolbar_model.h; sourceTree = "<group>"; }; - 4D7BF9510E9D4839009A6919 /* url_fetcher.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fetcher.cc; sourceTree = "<group>"; }; - 4D7BF9520E9D4839009A6919 /* url_fetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_fetcher.h; sourceTree = "<group>"; }; - 4D7BF9530E9D4839009A6919 /* url_fetcher_protect.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fetcher_protect.cc; sourceTree = "<group>"; }; - 4D7BF9540E9D4839009A6919 /* url_fetcher_protect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_fetcher_protect.h; sourceTree = "<group>"; }; 4D7BF9550E9D4839009A6919 /* url_fetcher_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fetcher_unittest.cc; sourceTree = "<group>"; }; 4D7BF9560E9D4839009A6919 /* url_fixer_upper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fixer_upper.cc; sourceTree = "<group>"; }; 4D7BF9570E9D4839009A6919 /* url_fixer_upper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_fixer_upper.h; sourceTree = "<group>"; }; @@ -1742,6 +1738,10 @@ 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; }; + 778D7927798B7E3FAA498D3D /* url_fetcher.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fetcher.cc; sourceTree = "<group>"; }; + EA72CF50C0AB4492A644C703 /* url_fetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_fetcher.h; sourceTree = "<group>"; }; + 0B7CC9C105E90E0665852528 /* url_fetcher_protect.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fetcher_protect.cc; sourceTree = "<group>"; }; + 433B6EFB7A1D931A13C9556F /* url_fetcher_protect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_fetcher_protect.h; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2239,10 +2239,6 @@ 4D7BF94E0E9D4839009A6919 /* template_url_unittest.cc */, 4D7BF94F0E9D4839009A6919 /* toolbar_model.cc */, 4D7BF9500E9D4839009A6919 /* toolbar_model.h */, - 4D7BF9510E9D4839009A6919 /* url_fetcher.cc */, - 4D7BF9520E9D4839009A6919 /* url_fetcher.h */, - 4D7BF9530E9D4839009A6919 /* url_fetcher_protect.cc */, - 4D7BF9540E9D4839009A6919 /* url_fetcher_protect.h */, 4D7BF9550E9D4839009A6919 /* url_fetcher_unittest.cc */, 4D7BF9560E9D4839009A6919 /* url_fixer_upper.cc */, 4D7BF9570E9D4839009A6919 /* url_fixer_upper.h */, @@ -2383,6 +2379,10 @@ E4F324790EE5D17E002533CE /* referrer.cc */, 4D7BFA720E9D4981009A6919 /* sdch_dictionary_fetcher.cc */, 4D7BFA730E9D4981009A6919 /* sdch_dictionary_fetcher.h */, + 778D7927798B7E3FAA498D3D /* url_fetcher.cc */, + EA72CF50C0AB4492A644C703 /* url_fetcher.h */, + 0B7CC9C105E90E0665852528 /* url_fetcher_protect.cc */, + 433B6EFB7A1D931A13C9556F /* url_fetcher_protect.h */, ); path = net; sourceTree = "<group>"; @@ -3746,8 +3746,8 @@ 4D7BFA390E9D4918009A6919 /* thumbnail_database.cc in Sources */, 4D7BFAC80E9D49D1009A6919 /* units.cc in Sources */, E4F324600EE5D011002533CE /* url_database.cc in Sources */, - E450761A0F150DE9003BE099 /* url_fetcher.cc in Sources */, - 4D7BF9BD0E9D489B009A6919 /* url_fetcher_protect.cc in Sources */, + 8F51B73AAAF1772ECF9BD180 /* url_fetcher.cc in Sources */, + 3AEA44DB19C9D93B63D7A2E4 /* url_fetcher_protect.cc in Sources */, E48FB9760EC4EA320052B72B /* url_request_failed_dns_job.cc in Sources */, E48FB9790EC4EA410052B72B /* url_request_mock_http_job.cc in Sources */, E48FB97A0EC4EA4A0052B72B /* url_request_mock_net_error_job.cc in Sources */, diff --git a/chrome/common/chrome_plugin_unittest.cc b/chrome/common/chrome_plugin_unittest.cc index 45088a8..39494a5 100644 --- a/chrome/common/chrome_plugin_unittest.cc +++ b/chrome/common/chrome_plugin_unittest.cc @@ -7,8 +7,8 @@ #include "base/path_service.h" #include "base/string_util.h" #include "chrome/browser/chrome_plugin_host.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/profile.h" -#include "chrome/browser/url_fetcher.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/test/chrome_plugin/test_chrome_plugin.h" #include "net/url_request/url_request_test_job.h" diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc index 48deae0..23cb072 100644 --- a/chrome/test/memory_test/memory_test.cc +++ b/chrome/test/memory_test/memory_test.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_process_filter.h" diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc index 59d0ce8..e42cf14 100644 --- a/chrome/test/page_cycler/page_cycler_test.cc +++ b/chrome/test/page_cycler/page_cycler_test.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_process_filter.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 353c599..0dfe427 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -40,7 +40,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 3393d69..06591ec 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -17,7 +17,7 @@ #include "base/test_file_util.h" #include "base/time.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 715dc23..ed94a9a 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -743,11 +743,11 @@ > </File> <File - RelativePath="..\..\browser\url_fetcher_unittest.cc" + RelativePath="..\..\browser\net\url_fetcher_unittest.cc" > </File> <File - RelativePath="..\..\browser\url_fixer_upper_unittest.cc" + RelativePath="..\..\browser\net\url_fixer_upper_unittest.cc" > </File> <File |