mash: Replace int ShelfIDs with AppLaunchID strings.

ash/metrics/user_metrics_recorder_unittest.cc

Index: ash/metrics/user_metrics_recorder_unittest.cc
diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc
index 4effbd16b720e0c4039a2e126b84f2c242a340b8..f7323bb90d0f81223f76f63a0cbc0437dd5e18d0 100644
--- a/ash/metrics/user_metrics_recorder_unittest.cc
+++ b/ash/metrics/user_metrics_recorder_unittest.cc
@@ -146,17 +146,17 @@ TEST_F(UserMetricsRecorderTest, ValuesRecordedByRecordShelfItemCounts) {
 
   ShelfItem shelf_item;
   shelf_item.type = ash::TYPE_PINNED_APP;
-  shelf_item.app_launch_id = AppLaunchId("app_id_1");
+  shelf_item.id = ShelfID("app_id_1");
   shelf_model->Add(shelf_item);
-  shelf_item.app_launch_id = AppLaunchId("app_id_2");
+  shelf_item.id = ShelfID("app_id_2");
   shelf_model->Add(shelf_item);
 
   shelf_item.type = ash::TYPE_APP;
-  shelf_item.app_launch_id = AppLaunchId("app_id_3");
+  shelf_item.id = ShelfID("app_id_3");
   shelf_model->Add(shelf_item);
-  shelf_item.app_launch_id = AppLaunchId("app_id_4");
+  shelf_item.id = ShelfID("app_id_4");
   shelf_model->Add(shelf_item);
-  shelf_item.app_launch_id = AppLaunchId("app_id_5");
+  shelf_item.id = ShelfID("app_id_5");
   shelf_model->Add(shelf_item);
 
   test_api().RecordPeriodicMetrics();