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

ash/shelf/shelf_controller_unittest.cc

 // Copyright 2017 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/shelf/shelf_controller.h"
 
 #include <set>
 #include <string>
 
 #include "ash/public/cpp/config.h"
+#include "ash/public/cpp/shelf_model.h"
+#include "ash/public/cpp/shelf_model_observer.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_model_observer.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "ui/display/types/display_constants.h"
 
 namespace ash {
 namespace {
 
 // A test implementation of the ShelfObserver mojo interface.
 class TestShelfObserver : public mojom::ShelfObserver {
@@ skipping 158 matching lines @@
   // |observer| is not notified; see mojom::ShelfController for rationale.
   controller->RemoveShelfItem(item.id);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, controller->model()->item_count());
   EXPECT_EQ(2u, observer.added_count());
   EXPECT_EQ(1u, observer.removed_count());
 }
 
 }  // namespace
 }  // namespace ash