Move metrics files into a subdir

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

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

48 files changed, 118 insertions, 110 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 3d43dbb..22f1574 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -20,12 +20,12 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/controller.h"
 #include "chrome/browser/drag_utils.h"
+#include "chrome/browser/metrics/user_metrics.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/user_metrics.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/back_forward_menu_model.cc b/chrome/browser/back_forward_menu_model.cc
index 2acd52e..50c7da1 100644
--- a/chrome/browser/back_forward_menu_model.cc
+++ b/chrome/browser/back_forward_menu_model.cc
@@ -6,10 +6,10 @@
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/history_tab_ui.h"
+#include "chrome/browser/metrics/user_metrics.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/user_metrics.h"
 #include "chrome/common/l10n_util.h"
 #include "net/base/registry_controlled_domain.h"
 
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index 1d1e589..0ca63246 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -8,10 +8,10 @@
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index a3cd5dd..94214d6 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/history_tab_ui.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
@@ -40,7 +41,6 @@
 #include "chrome/browser/task_manager.h"
 #include "chrome/browser/url_fixer_upper.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/download_tab_view.h"
 #include "chrome/browser/views/go_button.h"
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index d0d9221..490ed65 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -88,8 +88,9 @@ if not env.Bit('mac'):
       'importer/firefox_profile_lock.cc',
       'importer/mork_reader.cc',
       'meta_table_helper.cc',
-      'metrics_log.cc',
-      'metrics_response.cc',
+      'metrics/metrics_log.cc',
+      'metrics/metrics_response.cc',
+      'metrics/user_metrics.cc',
       'net/chrome_url_request_context.cc',
       'net/dns_host_info.cc',
       'net/referrer.cc',
@@ -126,7 +127,6 @@ if not env.Bit('mac'):
       'ssl_error_info.cc',
       'url_fetcher.cc',
       'url_fetcher_protect.cc',
-      'user_metrics.cc',
       'webdata/web_database.cc',
   ])
 
@@ -218,7 +218,7 @@ if env.Bit('windows'):
       'jsmessage_box_handler.cc',
       'login_prompt.cc',
       'memory_details.cc',
-      'metrics_service.cc',
+      'metrics/metrics_service.cc',
       'modal_html_dialog_delegate.cc',
       'net/dns_global.cc',
       'net/dns_master.cc',
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index cd93d66..5538417 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -422,30 +422,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\metrics_log.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\metrics_log.h"
-				>
-			</File>
-			<File
-				RelativePath=".\metrics_response.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\metrics_response.h"
-				>
-			</File>
-			<File
-				RelativePath=".\metrics_service.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\metrics_service.h"
-				>
-			</File>
-			<File
 				RelativePath=".\plugin_process_host.cc"
 				>
 			</File>
@@ -634,14 +610,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\user_metrics.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\user_metrics.h"
-				>
-			</File>
-			<File
 				RelativePath=".\visitedlink_master.cc"
 				>
 			</File>
@@ -2644,6 +2612,42 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Metrics"
+			>
+			<File
+				RelativePath=".\metrics\metrics_log.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\metrics\metrics_log.h"
+				>
+			</File>
+			<File
+				RelativePath=".\metrics\metrics_response.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\metrics\metrics_response.h"
+				>
+			</File>
+			<File
+				RelativePath=".\metrics\metrics_service.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\metrics\metrics_service.h"
+				>
+			</File>
+			<File
+				RelativePath=".\metrics\user_metrics.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\metrics\user_metrics.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\browser_trial.cc"
 			>
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 21e93e7..5c4e21d 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -49,7 +49,8 @@
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/jankometer.h"
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_service.h"
+#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/plugin_service.h"
@@ -58,7 +59,6 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/url_fixer_upper.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index 8d939f1..ef34c41 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -14,7 +14,7 @@
 #include "base/win_util.h"
 #include "chrome/app/result_codes.h"
 #include "chrome/browser/first_run.h"
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 4f83bac..db4abb0 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/google_url_tracker.h"
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_service.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"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index bccf10b..8b98a41 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/icon_manager.h"
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile_manager.h"
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index e0417fa..981737e 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/jankometer.h"
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/render_process_host.h"
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index e9140b2..0e40380 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -8,10 +8,10 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/cookie_monster.h"
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index 53d66c2..c9226a7 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -11,9 +11,9 @@
 #include "base/time_format.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_resources.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 7bb7d9f..8d11080 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -14,13 +14,13 @@
 #include "chrome/browser/dom_ui/dom_ui_contents.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/history/page_usage_data.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/history_tab_ui.cc b/chrome/browser/history_tab_ui.cc
index 6c63f2c..7f5f89d 100644
--- a/chrome/browser/history_tab_ui.cc
+++ b/chrome/browser/history_tab_ui.cc
@@ -8,7 +8,7 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/history_model.h"
 #include "chrome/browser/history_view.h"
-#include "chrome/browser/user_metrics.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/checkbox.h"
diff --git a/chrome/browser/history_view.cc b/chrome/browser/history_view.cc
index 15274a5..128fa87 100644
--- a/chrome/browser/history_view.cc
+++ b/chrome/browser/history_view.cc
@@ -9,9 +9,9 @@
 #include "base/word_iterator.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/drag_utils.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/tab_contents/native_ui_contents.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/bookmark_bubble_view.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/star_toggle.h"
diff --git a/chrome/browser/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index c79ca04d..3603e0c 100644
--- a/chrome/browser/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.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/metrics_log.h"
+#include "chrome/browser/metrics/metrics_log.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index 63ac23d..63ac23d 100644
--- a/chrome/browser/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
diff --git a/chrome/browser/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
index a8fd6f8..4899b43 100644
--- a/chrome/browser/metrics_log_unittest.cc
+++ b/chrome/browser/metrics/metrics_log_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/string_util.h"
 #include "base/time.h"
-#include "chrome/browser/metrics_log.h"
+#include "chrome/browser/metrics/metrics_log.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/metrics_response.cc b/chrome/browser/metrics/metrics_response.cc
index bef4ba2..1bb6afa 100644
--- a/chrome/browser/metrics_response.cc
+++ b/chrome/browser/metrics/metrics_response.cc
@@ -4,7 +4,7 @@
 
 #include <libxml/parser.h>
 
-#include "chrome/browser/metrics_response.h"
+#include "chrome/browser/metrics/metrics_response.h"
 
 // State to pass around during SAX parsing.
 struct SAXState {
diff --git a/chrome/browser/metrics_response.h b/chrome/browser/metrics/metrics_response.h
index c653fcf..c653fcf 100644
--- a/chrome/browser/metrics_response.h
+++ b/chrome/browser/metrics/metrics_response.h
diff --git a/chrome/browser/metrics_response_unittest.cc b/chrome/browser/metrics/metrics_response_unittest.cc
index e7c5825..e3c4568 100644
--- a/chrome/browser/metrics_response_unittest.cc
+++ b/chrome/browser/metrics/metrics_response_unittest.cc
@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "chrome/browser/metrics_response.h"
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_response.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index bb2ba62..399db59 100644
--- a/chrome/browser/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -156,7 +156,7 @@
 
 #include <windows.h>
 
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_service.h"
 
 #include "base/file_path.h"
 #include "base/histogram.h"
diff --git a/chrome/browser/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 8f2f827..f0f69ed 100644
--- a/chrome/browser/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -19,7 +19,7 @@
 #include "base/histogram.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/browser/metrics_log.h"
+#include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/url_fetcher.h"
 #include "chrome/common/notification_service.h"
 #include "webkit/glue/webplugin.h"
diff --git a/chrome/browser/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc
index db35f1c..db35f1c 100644
--- a/chrome/browser/metrics_service_uitest.cc
+++ b/chrome/browser/metrics/metrics_service_uitest.cc
diff --git a/chrome/browser/user_metrics.cc b/chrome/browser/metrics/user_metrics.cc
index 43dd88a..4049875 100644
--- a/chrome/browser/user_metrics.cc
+++ b/chrome/browser/metrics/user_metrics.cc
@@ -2,8 +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/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/common/notification_service.h"
 
 void UserMetrics::RecordAction(const wchar_t* action, Profile* profile) {
diff --git a/chrome/browser/user_metrics.h b/chrome/browser/metrics/user_metrics.h
index 995724a..7c3ed4c 100644
--- a/chrome/browser/user_metrics.h
+++ b/chrome/browser/metrics/user_metrics.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+class Profile;
+
 // This module provides some helper functions for logging actions tracked by
 // the user metrics system.
 
diff --git a/chrome/browser/render_view_host.cc b/chrome/browser/render_view_host.cc
index 399beee..16afeb5 100644
--- a/chrome/browser/render_view_host.cc
+++ b/chrome/browser/render_view_host.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/render_widget_host.h"
 #include "chrome/browser/render_widget_host_view.h"
@@ -22,7 +23,6 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/thumbnail_score.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 3b0c4bb..45a2246 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ -17,7 +18,6 @@
 #include "chrome/browser/tab_contents/tab_contents_factory.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 0df1ef3..033e136 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/color_utils.h"
-#include "chrome/browser/user_metrics.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/restart_message_box.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 0c32f22..438bb34 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -17,10 +17,10 @@
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/event_utils.h"
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 09ec122..792b6e0 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -8,8 +8,8 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/browser/views/standard_layout.h"
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 8401fe0..5b6482c 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/importer.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_folder_tree_view.h"
 #include "chrome/browser/views/bookmark_table_view.h"
diff --git a/chrome/browser/views/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc
index 474f0a7..c17c126 100644
--- a/chrome/browser/views/download_tab_view.cc
+++ b/chrome/browser/views/download_tab_view.cc
@@ -16,8 +16,8 @@
 #include "base/timer.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/text_elider.h"
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index 86f1cd0..af98b7f 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -6,11 +6,11 @@
 
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
+#include "chrome/browser/metrics/user_metrics.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/user_metrics.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/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc
index 7ff1b7d..b023095 100644
--- a/chrome/browser/views/first_run_customize_view.cc
+++ b/chrome/browser/views/first_run_customize_view.cc
@@ -8,7 +8,7 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/first_run.h"
-#include "chrome/browser/user_metrics.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index ee1c715..cfafb6b 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -8,9 +8,9 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/first_run.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/first_run_customize_view.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/checkbox.h"
diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc
index c919939..1a108c7 100644
--- a/chrome/browser/views/first_run_view_base.cc
+++ b/chrome/browser/views/first_run_view_base.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index e4acaa6..62063df 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -12,9 +12,9 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/edit_keyword_controller.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index e63526b..d3860e6 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/gears_integration.h"
-#include "chrome/browser/metrics_service.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/views/options/cookies_view.h"
diff --git a/chrome/browser/views/options/language_combobox_model.cc b/chrome/browser/views/options/language_combobox_model.cc
index 44c1f0c..1471fd8 100644
--- a/chrome/browser/views/options/language_combobox_model.cc
+++ b/chrome/browser/views/options/language_combobox_model.cc
@@ -6,7 +6,7 @@
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/user_metrics.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_service.h"
 #include "unicode/uloc.h"
diff --git a/chrome/browser/views/options/options_page_view.cc b/chrome/browser/views/options/options_page_view.cc
index 8fa28a4..e1eff1c 100644
--- a/chrome/browser/views/options/options_page_view.cc
+++ b/chrome/browser/views/options/options_page_view.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/views/options/options_page_view.h"
 
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/user_metrics.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/widget.h"
 
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index 57efb2d..36dfb62 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -9,7 +9,7 @@
 
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/user_metrics.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/dragged_tab_view.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 7791289..9e99b5d 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -6,10 +6,10 @@
 
 #include "base/gfx/size.h"
 #include "chrome/app/theme/theme_resources.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 #include "chrome/browser/views/tabs/tab.h"
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index aa3b4e9..091c97e 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -16,11 +16,11 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/drag_utils.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/dom_view.h"
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 364e272..a8c7f78 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -89,12 +89,10 @@
 		4D7BF9990E9D486B009A6919 /* google_url_tracker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8870E9D4839009A6919 /* google_url_tracker.cc */; };
 		4D7BF99E0E9D486F009A6919 /* google_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF88A0E9D4839009A6919 /* google_util.cc */; };
 		4D7BF9A00E9D4875009A6919 /* meta_table_helper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8AF0E9D4839009A6919 /* meta_table_helper.cc */; };
-		4D7BF9A50E9D487B009A6919 /* metrics_response.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8B40E9D4839009A6919 /* metrics_response.cc */; };
 		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 */; };
-		4D7BF9C20E9D489E009A6919 /* user_metrics.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9590E9D4839009A6919 /* user_metrics.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 */; };
@@ -182,7 +180,6 @@
 		4DCE9DDF0EF0B73300682526 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45065DD0EEEC6FF003BE099 /* AppKit.framework */; };
 		4DCE9DE00EF0B73300682526 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45065DF0EEEC709003BE099 /* Foundation.framework */; };
 		4DCE9E2D0EF0B8C000682526 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4DCE9E2B0EF0B8C000682526 /* MainMenu.xib */; };
-		4DDC63E70EAE344300FB5EBE /* metrics_response_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8B60E9D4839009A6919 /* metrics_response_unittest.cc */; };
 		4DDC644B0EAE390800FB5EBE /* libxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFB230E9D4BBF009A6919 /* libxml.a */; };
 		4DDC64580EAE394200FB5EBE /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDC64550EAE392400FB5EBE /* libzlib.a */; };
 		A54612DC0EE9958600A8EE5D /* extensions_service_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A54612DB0EE9958600A8EE5D /* extensions_service_unittest.cc */; };
@@ -276,7 +273,6 @@
 		E45075C40F150701003BE099 /* firefox3_importer.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075C30F150701003BE099 /* firefox3_importer.cc */; };
 		E45075C60F15070D003BE099 /* firefox_profile_lock.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075C50F15070D003BE099 /* firefox_profile_lock.cc */; };
 		E45075CD0F150741003BE099 /* mork_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075CC0F150741003BE099 /* mork_reader.cc */; };
-		E45075D30F1508F7003BE099 /* metrics_log.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8B10E9D4839009A6919 /* metrics_log.cc */; };
 		E45075DC0F150A53003BE099 /* async_resource_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075DA0F150A53003BE099 /* async_resource_handler.cc */; };
 		E45075E20F150A6F003BE099 /* buffered_resource_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075DF0F150A6F003BE099 /* buffered_resource_handler.cc */; };
 		E45075E30F150A6F003BE099 /* download_throttling_resource_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45075E10F150A6F003BE099 /* download_throttling_resource_handler.cc */; };
@@ -332,6 +328,12 @@
 		9A1EE0F9187ACE2DCB8512E1 /* template_url.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3CCF8AA8A56FF8FE59F0C299 /* template_url.cc */; };
 		C39F08C4FFD9C2F98384F56B /* template_url_model.cc in Sources */ = {isa = PBXBuildFile; fileRef = EA72C084DB3FC0FC595E525E /* template_url_model.cc */; };
 		B9BF55F87A4BB2FD366B6DDC /* template_url_parser.cc in Sources */ = {isa = PBXBuildFile; fileRef = 28AA584AB2ECFB33C7C7FD8A /* template_url_parser.cc */; };
+		0A23317817C5434213577FF7 /* metrics_log.cc in Sources */ = {isa = PBXBuildFile; fileRef = CBB7C480D8F43BDDE0B209B7 /* metrics_log.cc */; };
+		91DF3AC086DD3E1E5204AD90 /* metrics_response.cc in Sources */ = {isa = PBXBuildFile; fileRef = 11525634D3FBF3508C475B46 /* metrics_response.cc */; };
+		D12BDACC98D8E06E3E852509 /* metrics_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = 09E89F13F9048F95F68B4887 /* metrics_service.cc */; };
+		3653515103659318E46EE67C /* user_metrics.cc in Sources */ = {isa = PBXBuildFile; fileRef = EFB2D9BDD612A100477ECCBD /* user_metrics.cc */; };
+		F922CF8CE7BF09D4C5B1D89C /* metrics_log_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 187598100CC57B863A3BDD57 /* metrics_log_unittest.cc */; };
+		F9B538451524D56377E15A11 /* metrics_response_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = F145A671557D09F55DCD580A /* metrics_response_unittest.cc */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -1104,15 +1106,6 @@
 		4D7BF8AE0E9D4839009A6919 /* memory_details.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory_details.h; sourceTree = "<group>"; };
 		4D7BF8AF0E9D4839009A6919 /* meta_table_helper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = meta_table_helper.cc; sourceTree = "<group>"; };
 		4D7BF8B00E9D4839009A6919 /* meta_table_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = meta_table_helper.h; sourceTree = "<group>"; };
-		4D7BF8B10E9D4839009A6919 /* metrics_log.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metrics_log.cc; sourceTree = "<group>"; };
-		4D7BF8B20E9D4839009A6919 /* metrics_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = metrics_log.h; sourceTree = "<group>"; };
-		4D7BF8B30E9D4839009A6919 /* metrics_log_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metrics_log_unittest.cc; sourceTree = "<group>"; };
-		4D7BF8B40E9D4839009A6919 /* metrics_response.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metrics_response.cc; sourceTree = "<group>"; };
-		4D7BF8B50E9D4839009A6919 /* metrics_response.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = metrics_response.h; sourceTree = "<group>"; };
-		4D7BF8B60E9D4839009A6919 /* metrics_response_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metrics_response_unittest.cc; sourceTree = "<group>"; };
-		4D7BF8B70E9D4839009A6919 /* metrics_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metrics_service.cc; sourceTree = "<group>"; };
-		4D7BF8B80E9D4839009A6919 /* metrics_service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = metrics_service.h; sourceTree = "<group>"; };
-		4D7BF8B90E9D4839009A6919 /* metrics_service_uitest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metrics_service_uitest.cc; sourceTree = "<group>"; };
 		4D7BF8BA0E9D4839009A6919 /* modal_html_dialog_delegate.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = modal_html_dialog_delegate.cc; sourceTree = "<group>"; };
 		4D7BF8BB0E9D4839009A6919 /* modal_html_dialog_delegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modal_html_dialog_delegate.h; sourceTree = "<group>"; };
 		4D7BF8C00E9D4839009A6919 /* navigation_controller_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = navigation_controller_unittest.cc; sourceTree = "<group>"; };
@@ -1207,8 +1200,6 @@
 		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>"; };
 		4D7BF9580E9D4839009A6919 /* url_fixer_upper_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fixer_upper_unittest.cc; sourceTree = "<group>"; };
-		4D7BF9590E9D4839009A6919 /* user_metrics.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_metrics.cc; sourceTree = "<group>"; };
-		4D7BF95A0E9D4839009A6919 /* user_metrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user_metrics.h; sourceTree = "<group>"; };
 		4D7BF95B0E9D4839009A6919 /* view_ids.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = view_ids.h; sourceTree = "<group>"; };
 		4D7BF95F0E9D4839009A6919 /* visitedlink_master.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visitedlink_master.cc; sourceTree = "<group>"; };
 		4D7BF9600E9D4839009A6919 /* visitedlink_master.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visitedlink_master.h; sourceTree = "<group>"; };
@@ -1737,6 +1728,16 @@
 		3CCF8AA8A56FF8FE59F0C299 /* template_url.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = template_url.cc; path = browser/search_engines/template_url.cc; sourceTree = SOURCE_ROOT; };
 		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; };
 		28AA584AB2ECFB33C7C7FD8A /* template_url_parser.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = template_url_parser.cc; path = browser/search_engines/template_url_parser.cc; sourceTree = SOURCE_ROOT; };
+		CBB7C480D8F43BDDE0B209B7 /* metrics_log.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = metrics_log.cc; path = browser/metrics/metrics_log.cc; sourceTree = SOURCE_ROOT; };
+		BECA74AB55A20C7B219C56C4 /* metrics_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = metrics_log.h; path = browser/metrics/metrics_log.h; sourceTree = SOURCE_ROOT; };
+		11525634D3FBF3508C475B46 /* metrics_response.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = metrics_response.cc; path = browser/metrics/metrics_response.cc; sourceTree = SOURCE_ROOT; };
+		C1A9B7D1DFCAB14CDA43BA4C /* metrics_response.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = metrics_response.h; path = browser/metrics/metrics_response.h; sourceTree = SOURCE_ROOT; };
+		09E89F13F9048F95F68B4887 /* metrics_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = metrics_service.cc; path = browser/metrics/metrics_service.cc; sourceTree = SOURCE_ROOT; };
+		B7339F2B805ACBB3BDF748BC /* metrics_service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = metrics_service.h; path = browser/metrics/metrics_service.h; 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; };
+		DD32402B093835283164616B /* user_metrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = user_metrics.h; path = browser/metrics/user_metrics.h; sourceTree = SOURCE_ROOT; };
+		187598100CC57B863A3BDD57 /* metrics_log_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = metrics_log_unittest.cc; path = browser/metrics/metrics_log_unittest.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; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1947,6 +1948,16 @@
 				3CCF8AA8A56FF8FE59F0C299 /* template_url.cc */,
 				EA72C084DB3FC0FC595E525E /* template_url_model.cc */,
 				28AA584AB2ECFB33C7C7FD8A /* template_url_parser.cc */,
+				CBB7C480D8F43BDDE0B209B7 /* metrics_log.cc */,
+				BECA74AB55A20C7B219C56C4 /* metrics_log.h */,
+				11525634D3FBF3508C475B46 /* metrics_response.cc */,
+				C1A9B7D1DFCAB14CDA43BA4C /* metrics_response.h */,
+				09E89F13F9048F95F68B4887 /* metrics_service.cc */,
+				B7339F2B805ACBB3BDF748BC /* metrics_service.h */,
+				EFB2D9BDD612A100477ECCBD /* user_metrics.cc */,
+				DD32402B093835283164616B /* user_metrics.h */,
+				187598100CC57B863A3BDD57 /* metrics_log_unittest.cc */,
+				F145A671557D09F55DCD580A /* metrics_response_unittest.cc */,
 			);
 			sourceTree = "<group>";
 		};
@@ -2133,15 +2144,6 @@
 				4D7BF8AE0E9D4839009A6919 /* memory_details.h */,
 				4D7BF8AF0E9D4839009A6919 /* meta_table_helper.cc */,
 				4D7BF8B00E9D4839009A6919 /* meta_table_helper.h */,
-				4D7BF8B10E9D4839009A6919 /* metrics_log.cc */,
-				4D7BF8B20E9D4839009A6919 /* metrics_log.h */,
-				4D7BF8B30E9D4839009A6919 /* metrics_log_unittest.cc */,
-				4D7BF8B40E9D4839009A6919 /* metrics_response.cc */,
-				4D7BF8B50E9D4839009A6919 /* metrics_response.h */,
-				4D7BF8B60E9D4839009A6919 /* metrics_response_unittest.cc */,
-				4D7BF8B70E9D4839009A6919 /* metrics_service.cc */,
-				4D7BF8B80E9D4839009A6919 /* metrics_service.h */,
-				4D7BF8B90E9D4839009A6919 /* metrics_service_uitest.cc */,
 				4D7BF8BA0E9D4839009A6919 /* modal_html_dialog_delegate.cc */,
 				4D7BF8BB0E9D4839009A6919 /* modal_html_dialog_delegate.h */,
 				4D7BF8C00E9D4839009A6919 /* navigation_controller_unittest.cc */,
@@ -2239,8 +2241,6 @@
 				4D7BF9560E9D4839009A6919 /* url_fixer_upper.cc */,
 				4D7BF9570E9D4839009A6919 /* url_fixer_upper.h */,
 				4D7BF9580E9D4839009A6919 /* url_fixer_upper_unittest.cc */,
-				4D7BF9590E9D4839009A6919 /* user_metrics.cc */,
-				4D7BF95A0E9D4839009A6919 /* user_metrics.h */,
 				4D7BF95B0E9D4839009A6919 /* view_ids.h */,
 				4D7BF95F0E9D4839009A6919 /* visitedlink_master.cc */,
 				4D7BF9600E9D4839009A6919 /* visitedlink_master.h */,
@@ -3702,8 +3702,9 @@
 				4D7BFA260E9D4908009A6919 /* in_memory_history_backend.cc in Sources */,
 				E45075B70F1505DD003BE099 /* keyword_provider.cc in Sources */,
 				4D7BF9A00E9D4875009A6919 /* meta_table_helper.cc in Sources */,
-				E45075D30F1508F7003BE099 /* metrics_log.cc in Sources */,
-				4D7BF9A50E9D487B009A6919 /* metrics_response.cc in Sources */,
+				0A23317817C5434213577FF7 /* metrics_log.cc in Sources */,
+				91DF3AC086DD3E1E5204AD90 /* metrics_response.cc in Sources */,
+				D12BDACC98D8E06E3E852509 /* metrics_service.cc in Sources */,
 				E45075CD0F150741003BE099 /* mork_reader.cc in Sources */,
 				4D7BFABB0E9D49C1009A6919 /* page_number.cc in Sources */,
 				4D7BFAC60E9D49CB009A6919 /* page_range.cc in Sources */,
@@ -3744,7 +3745,7 @@
 				E48FB9790EC4EA410052B72B /* url_request_mock_http_job.cc in Sources */,
 				E48FB97A0EC4EA4A0052B72B /* url_request_mock_net_error_job.cc in Sources */,
 				E48FB97C0EC4EA540052B72B /* url_request_slow_download_job.cc in Sources */,
-				4D7BF9C20E9D489E009A6919 /* user_metrics.cc in Sources */,
+				3653515103659318E46EE67C /* user_metrics.cc in Sources */,
 				E46C42130F1D3DD200B393B8 /* user_script_master.cc in Sources */,
 				4D7BFA3E0E9D491B009A6919 /* visit_database.cc in Sources */,
 				4D7BFA430E9D491E009A6919 /* visit_tracker.cc in Sources */,
@@ -3766,13 +3767,14 @@
 				4D7BFB510E9D4C3E009A6919 /* dns_host_info_unittest.cc in Sources */,
 				E4F324950EE5D758002533CE /* extension_unittest.cc in Sources */,
 				A54612DC0EE9958600A8EE5D /* extensions_service_unittest.cc in Sources */,
+				F922CF8CE7BF09D4C5B1D89C /* metrics_log_unittest.cc in Sources */,
+				F9B538451524D56377E15A11 /* metrics_response_unittest.cc in Sources */,
 				B503E0FC0F01764800547DC6 /* user_script_slave_unittest.cc in Sources */,
 				4D7BFB3C0E9D4C25009A6919 /* history_types_unittest.cc in Sources */,
 				B507AC440F004B610060FEE8 /* ipc_sync_message_unittest.cc in Sources */,
 				4D7BFCE30E9D4DCE009A6919 /* jpeg_codec_unittest.cc in Sources */,
 				4D7BFCE70E9D4DD4009A6919 /* json_value_serializer_unittest.cc in Sources */,
 				B52E29BE0F0AA333008AD1C8 /* l10n_util_unittest.cc in Sources */,
-				4DDC63E70EAE344300FB5EBE /* metrics_response_unittest.cc in Sources */,
 				E450775F0F154036003BE099 /* mru_cache_unittest.cc in Sources */,
 				E45077620F15405C003BE099 /* notification_service_unittest.cc in Sources */,
 				4D7BFB580E9D4C43009A6919 /* page_range_unittest.cc in Sources */,
diff --git a/chrome/test/ui/ui_tests.vcproj b/chrome/test/ui/ui_tests.vcproj
index 83e351c..e4c7c14 100644
--- a/chrome/test/ui/ui_tests.vcproj
+++ b/chrome/test/ui/ui_tests.vcproj
@@ -422,7 +422,7 @@
 			Name="TestMetricsService"
 			>
 			<File
-				RelativePath="..\..\browser\metrics_service_uitest.cc"
+				RelativePath="..\..\browser\metrics\metrics_service_uitest.cc"
 				>
 			</File>
 		</Filter>
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 6b1a977..715dc23 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -499,11 +499,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\browser\metrics_log_unittest.cc"
+			RelativePath="..\..\browser\metrics\metrics_log_unittest.cc"
 			>
 		</File>
 		<File
-			RelativePath="..\..\browser\metrics_response_unittest.cc"
+			RelativePath="..\..\browser\metrics\metrics_response_unittest.cc"
 			>
 		</File>
 		<File