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

ash/test/test_shelf_delegate.h

 // 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.
 
-#ifndef ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
-#define ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
+#ifndef ASH_TEST_TEST_SHELF_DELEGATE_H_
+#define ASH_TEST_TEST_SHELF_DELEGATE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
-#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/shelf/shelf_delegate.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
 
 namespace ash {
 
 class WmWindow;
 
 namespace test {
 
 class ShelfInitializer;
@@ skipping 53 matching lines @@
 
   // Tracks the ShelfID to app id mappings.
   std::map<ShelfID, std::string> shelf_id_to_app_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
-#endif  // ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
+#endif  // ASH_TEST_TEST_SHELF_DELEGATE_H_