Move content deduplication into the scan process.

ui/file_manager/file_manager/common/js/metrics_events.js

Index: ui/file_manager/file_manager/common/js/metrics_events.js
diff --git a/ui/file_manager/file_manager/common/js/metrics_events.js b/ui/file_manager/file_manager/common/js/metrics_events.js
index df0f8480094a3d57551a7b50b674608ad9e43e75..c3b28c3e9556d4ef61ebc66b7d6eb8b56d42d8ef 100644
--- a/ui/file_manager/file_manager/common/js/metrics_events.js
+++ b/ui/file_manager/file_manager/common/js/metrics_events.js
@@ -62,32 +62,23 @@ metrics.ImportEvents = {
       .dimension(metrics.Dimensions.SESSION_TYPE_IMPORT)
       .dimension(metrics.Dimensions.USER_TYPE_IMPORT),
 
-  ENDED: metrics.event.Builders_.IMPORT
-      .action('Import Completed'),
-
   CANCELLED: metrics.event.Builders_.IMPORT
       .action('Import Cancelled'),
 
-  ERROR: metrics.event.Builders_.IMPORT
-      .action('Import Error'),
+  ERRORS: metrics.event.Builders_.IMPORT
+      .action('Import Error Count'),
 
-  FILE_COUNT: metrics.event.Builders_.IMPORT
+  FILES_IMPORTED: metrics.event.Builders_.IMPORT
       .action('Files Imported'),
 
-  BYTE_COUNT: metrics.event.Builders_.IMPORT
-      .action('Total Bytes Imported'),
+  MEGABYTES_IMPORTED: metrics.event.Builders_.IMPORT
+      .action('Megabytes Imported'),
 
   DEVICE_YANKED: metrics.event.Builders_.IMPORT
       .action('Device Yanked'),
 
-  HISTORY_DEDUPE_COUNT: metrics.event.Builders_.IMPORT
-      .action('Files Deduped By History'),
-
-  CONTENT_DEDUPE_COUNT: metrics.event.Builders_.IMPORT
-      .action('Files Deduped By Content'),
-
-  HISTORY_CHANGED: metrics.event.Builders_.IMPORT
-      .action('History Changed')
+  FILES_DEDUPLICATED: metrics.event.Builders_.IMPORT
+      .action('Files Deduplicated')
 };
 
 // namespace