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

ash/common/shelf/shelf_button_pressed_metric_tracker_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/shelf/shelf_button_pressed_metric_tracker.h"
+#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
 
 #include <utility>
 
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_shell.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/test/user_action_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/views/controls/button/button.h"
@@ skipping 284 matching lines @@
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
   histogram_tester.ExpectBucketCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName,
       kTimeDeltaInMilliseconds, 1);
 }
 
 }  // namespace test
 }  // namespace ash