chromeos: Move files in //ash/common to //ash, part 2

ash/shelf/shelf_application_menu_model_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/common/shelf/shelf_application_menu_model.h"
+#include "ash/shelf/shelf_application_menu_model.h"
 
 #include <utility>
 
-#include "ash/common/test/test_shelf_item_delegate.h"
 #include "ash/public/cpp/shelf_application_menu_item.h"
+#include "ash/test/test_shelf_item_delegate.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 103 matching lines @@
   items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(0, title));
   test::TestShelfItemDelegate test_delegate(nullptr);
   ShelfApplicationMenuModel menu(title, std::move(items), &test_delegate);
   menu.ExecuteCommand(0, 0);
 
   histogram_tester.ExpectTotalCount(kNumItemsEnabledHistogramName, 1);
   histogram_tester.ExpectTotalCount(kSelectedMenuItemIndexHistogramName, 1);
 }
 
 }  // namespace ash