Revert of Move //device/generic_sensor to be part of the internal implementation of the Device Service.

content/browser/generic_sensor_browsertest.cc

 // Copyright 2016 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
-#include "services/device/generic_sensor/platform_sensor.h"
-#include "services/device/generic_sensor/platform_sensor_provider.h"
-#include "services/device/generic_sensor/sensor_provider_impl.h"
+#include "device/generic_sensor/platform_sensor.h"
+#include "device/generic_sensor/platform_sensor_provider.h"
+#include "device/generic_sensor/sensor_provider_impl.h"
 
 namespace content {
 
 namespace {
 
 class FakeAmbientLightSensor : public device::PlatformSensor {
  public:
   FakeAmbientLightSensor(device::mojom::SensorType type,
                          mojo::ScopedSharedBufferMapping mapping,
                          device::PlatformSensorProvider* provider)
@@ skipping 94 matching lines @@
   // expects to get events with fake values then navigates to #pass.
   GURL test_url =
       GetTestUrl("generic_sensor", "ambient_light_sensor_test.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 }  //  namespace
 
 }  //  namespace content