mash: Replace int ShelfIDs with AppLaunchID strings.

ash/metrics/user_metrics_recorder_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/metrics/user_metrics_recorder.h"
 
 #include <memory>
 
 #include "ash/login_status.h"
 #include "ash/public/cpp/config.h"
@@ skipping 128 matching lines @@
 
   SetSessionStarted(true);
 
   // Make sure the shelf contains the app list launcher button.
   ShelfModel* shelf_model = Shell::Get()->shelf_model();
   ASSERT_EQ(1u, shelf_model->items().size());
   ASSERT_EQ(TYPE_APP_LIST, shelf_model->items()[0].type);
 
   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();
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfItems, 5, 1);
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfPinnedItems, 2, 1);
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfUnpinnedItems, 3, 1);
 }
 
 }  // namespace ash