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
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..490ed65a 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -88,8 +88,9 @@
'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 @@
'ssl_error_info.cc',
'url_fetcher.cc',
'url_fetcher_protect.cc',
- 'user_metrics.cc',
'webdata/web_database.cc',
])
@@ -218,7 +218,7 @@
'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..5538417ea 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 21e93e73..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..8b98a41c 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 e0417fa8..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 e9140b28..0e403807 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 6c63f2c9..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
similarity index 99%
rename from chrome/browser/metrics_log.cc
rename to 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
similarity index 100%
rename from chrome/browser/metrics_log.h
rename to chrome/browser/metrics/metrics_log.h
diff --git a/chrome/browser/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
similarity index 98%
rename from chrome/browser/metrics_log_unittest.cc
rename to chrome/browser/metrics/metrics_log_unittest.cc
index a8fd6f81..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
similarity index 97%
rename from chrome/browser/metrics_response.cc
rename to chrome/browser/metrics/metrics_response.cc
index bef4ba29..1bb6afa0 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
similarity index 100%
rename from chrome/browser/metrics_response.h
rename to chrome/browser/metrics/metrics_response.h
diff --git a/chrome/browser/metrics_response_unittest.cc b/chrome/browser/metrics/metrics_response_unittest.cc
similarity index 96%
rename from chrome/browser/metrics_response_unittest.cc
rename to 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
similarity index 99%
rename from chrome/browser/metrics_service.cc
rename to chrome/browser/metrics/metrics_service.cc
index bb2ba6242..399db595 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
similarity index 99%
rename from chrome/browser/metrics_service.h
rename to chrome/browser/metrics/metrics_service.h
index 8f2f827333..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
similarity index 100%
rename from chrome/browser/metrics_service_uitest.cc
rename to chrome/browser/metrics/metrics_service_uitest.cc
diff --git a/chrome/browser/user_metrics.cc b/chrome/browser/metrics/user_metrics.cc
similarity index 92%
rename from chrome/browser/user_metrics.cc
rename to chrome/browser/metrics/user_metrics.cc
index 43dd88a..40498750b 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
similarity index 98%
rename from chrome/browser/user_metrics.h
rename to chrome/browser/metrics/user_metrics.h
index 995724a0..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..45a22466 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..033e1367 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 0c32f220..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..792b6e06 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 8401fe0a..5b6482c1 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..c17c1265 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 7ff1b7d6..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 ee1c7159..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 c919939d..1a108c7f 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..1471fd8a 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 57efb2d51..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 7791289b..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 aa3b4e9a..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"
