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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include "ash/public/cpp/shelf_item_delegate.h"
+#include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shelf/app_list_button.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 2478 matching lines @@
 
 // Chrome's ShelfModel should have AppList and browser items and delegates.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ShelfModelInitialization) {
   ash::ShelfModel* model = controller_->shelf_model();
   EXPECT_EQ(2, model->item_count());
   EXPECT_EQ(ash::kAppListId, model->items()[0].id.app_id);
   EXPECT_TRUE(model->GetShelfItemDelegate(model->items()[0].id));
   EXPECT_EQ(extension_misc::kChromeAppId, model->items()[1].id.app_id);
   EXPECT_TRUE(model->GetShelfItemDelegate(model->items()[1].id));
 }