mash: Move ShelfModel* to ash/public/cpp.

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"
+#include "ash/public/cpp/shelf_model.h"
 #include "ash/session/session_controller.h"
-#include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_controller_client.h"
 #include "ash/test/user_metrics_recorder_test_api.h"
 #include "base/test/histogram_tester.h"
 
 using session_manager::SessionState;
 
 namespace ash {
@@ skipping 135 matching lines @@
   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