am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."

* commit '795ad6c74488f8f9f202010be4a0b3df30d2d0de': metricsd: Rename metrics to metricsd.
2015-08-10 22:51:33 +00:00 · 2015-08-10 22:51:33 +00:00 · 9b74ac9301
parent c170fcf8ed 795ad6c744
commit 9b74ac9301
64 changed files with 3 additions and 3 deletions
--- a/metricsd/MODULE_LICENSE_BSD
+++ b/metricsd/MODULE_LICENSE_BSD
--- a/metricsd/NOTICE
+++ b/metricsd/NOTICE
--- a/metricsd/OWNERS
+++ b/metricsd/OWNERS
--- a/metricsd/README
+++ b/metricsd/README
--- a/metricsd/WATCHLISTS
+++ b/metricsd/WATCHLISTS
--- a/metricsd/c_metrics_library.cc
+++ b/metricsd/c_metrics_library.cc
--- a/metricsd/constants.h
+++ b/metricsd/constants.h
--- a/metricsd/include/metrics/c_metrics_library.h
+++ b/metricsd/include/metrics/c_metrics_library.h
--- a/metricsd/include/metrics/metrics_library.h
+++ b/metricsd/include/metrics/metrics_library.h
--- a/metricsd/init/metrics_daemon.conf
+++ b/metricsd/init/metrics_daemon.conf
--- a/metricsd/init/metrics_library.conf
+++ b/metricsd/init/metrics_library.conf
--- a/metricsd/libmetrics-334380.gyp
+++ b/metricsd/libmetrics-334380.gyp
--- a/metricsd/libmetrics.gypi
+++ b/metricsd/libmetrics.gypi
--- a/metricsd/libmetrics.pc.in
+++ b/metricsd/libmetrics.pc.in
--- a/metricsd/make_tests.sh
+++ b/metricsd/make_tests.sh
--- a/metricsd/metrics.gyp
+++ b/metricsd/metrics.gyp
--- a/metricsd/metrics_client.cc
+++ b/metricsd/metrics_client.cc
--- a/metricsd/metrics_daemon.cc
+++ b/metricsd/metrics_daemon.cc
--- a/metricsd/metrics_daemon.h
+++ b/metricsd/metrics_daemon.h
--- a/metricsd/metrics_daemon_main.cc
+++ b/metricsd/metrics_daemon_main.cc
--- a/metricsd/metrics_daemon_test.cc
+++ b/metricsd/metrics_daemon_test.cc
--- a/metricsd/metrics_library.cc
+++ b/metricsd/metrics_library.cc
--- a/metricsd/metrics_library_mock.h
+++ b/metricsd/metrics_library_mock.h
--- a/metricsd/metrics_library_test.cc
+++ b/metricsd/metrics_library_test.cc
--- a/metricsd/persistent_integer.cc
+++ b/metricsd/persistent_integer.cc
--- a/metricsd/persistent_integer.h
+++ b/metricsd/persistent_integer.h
--- a/metricsd/persistent_integer_mock.h
+++ b/metricsd/persistent_integer_mock.h
--- a/metricsd/persistent_integer_test.cc
+++ b/metricsd/persistent_integer_test.cc
--- a/metricsd/platform2_preinstall.sh
+++ b/metricsd/platform2_preinstall.sh
--- a/metricsd/serialization/metric_sample.cc
+++ b/metricsd/serialization/metric_sample.cc
--- a/metricsd/serialization/metric_sample.h
+++ b/metricsd/serialization/metric_sample.h
--- a/metricsd/serialization/serialization_utils.cc
+++ b/metricsd/serialization/serialization_utils.cc
--- a/metricsd/serialization/serialization_utils.h
+++ b/metricsd/serialization/serialization_utils.h
--- a/metricsd/serialization/serialization_utils_unittest.cc
+++ b/metricsd/serialization/serialization_utils_unittest.cc
--- a/metricsd/syslog_parser.sh
+++ b/metricsd/syslog_parser.sh
--- a/metricsd/timer.cc
+++ b/metricsd/timer.cc
--- a/metricsd/timer.h
+++ b/metricsd/timer.h
--- a/metricsd/timer_mock.h
+++ b/metricsd/timer_mock.h
--- a/metricsd/timer_test.cc
+++ b/metricsd/timer_test.cc
--- a/metricsd/uploader/metrics_hashes.cc
+++ b/metricsd/uploader/metrics_hashes.cc
--- a/metricsd/uploader/metrics_hashes.h
+++ b/metricsd/uploader/metrics_hashes.h
--- a/metricsd/uploader/metrics_hashes_unittest.cc
+++ b/metricsd/uploader/metrics_hashes_unittest.cc
--- a/metricsd/uploader/metrics_log.cc
+++ b/metricsd/uploader/metrics_log.cc
--- a/metricsd/uploader/metrics_log.h
+++ b/metricsd/uploader/metrics_log.h
--- a/metricsd/uploader/metrics_log_base.cc
+++ b/metricsd/uploader/metrics_log_base.cc
--- a/metricsd/uploader/metrics_log_base.h
+++ b/metricsd/uploader/metrics_log_base.h
--- a/metricsd/uploader/metrics_log_base_unittest.cc
+++ b/metricsd/uploader/metrics_log_base_unittest.cc
--- a/metricsd/uploader/mock/mock_system_profile_setter.h
+++ b/metricsd/uploader/mock/mock_system_profile_setter.h
--- a/metricsd/uploader/mock/sender_mock.cc
+++ b/metricsd/uploader/mock/sender_mock.cc
--- a/metricsd/uploader/mock/sender_mock.h
+++ b/metricsd/uploader/mock/sender_mock.h
--- a/metricsd/uploader/proto/README
+++ b/metricsd/uploader/proto/README
--- a/metricsd/uploader/proto/chrome_user_metrics_extension.proto
+++ b/metricsd/uploader/proto/chrome_user_metrics_extension.proto
@ -14,9 +14,9 @@ option java_package = "org.chromium.components.metrics";

 package metrics;

-import "system/core/metrics/uploader/proto/histogram_event.proto";
-import "system/core/metrics/uploader/proto/system_profile.proto";
-import "system/core/metrics/uploader/proto/user_action_event.proto";
+import "system/core/metricsd/uploader/proto/histogram_event.proto";
+import "system/core/metricsd/uploader/proto/system_profile.proto";
+import "system/core/metricsd/uploader/proto/user_action_event.proto";

 // Next tag: 13
 message ChromeUserMetricsExtension {
--- a/metricsd/uploader/proto/histogram_event.proto
+++ b/metricsd/uploader/proto/histogram_event.proto
--- a/metricsd/uploader/proto/system_profile.proto
+++ b/metricsd/uploader/proto/system_profile.proto
--- a/metricsd/uploader/proto/user_action_event.proto
+++ b/metricsd/uploader/proto/user_action_event.proto
--- a/metricsd/uploader/sender.h
+++ b/metricsd/uploader/sender.h
--- a/metricsd/uploader/sender_http.cc
+++ b/metricsd/uploader/sender_http.cc
--- a/metricsd/uploader/sender_http.h
+++ b/metricsd/uploader/sender_http.h
--- a/metricsd/uploader/system_profile_cache.cc
+++ b/metricsd/uploader/system_profile_cache.cc
--- a/metricsd/uploader/system_profile_cache.h
+++ b/metricsd/uploader/system_profile_cache.h
--- a/metricsd/uploader/system_profile_setter.h
+++ b/metricsd/uploader/system_profile_setter.h
--- a/metricsd/uploader/upload_service.cc
+++ b/metricsd/uploader/upload_service.cc
--- a/metricsd/uploader/upload_service.h
+++ b/metricsd/uploader/upload_service.h
--- a/metricsd/uploader/upload_service_test.cc
+++ b/metricsd/uploader/upload_service_test.cc