Rename device_orientation to device_sensors

content/browser/device_sensors/device_inertial_sensor_service.cc

 // 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.
 
-#include "content/browser/device_orientation/device_inertial_sensor_service.h"
+#include "content/browser/device_sensors/device_inertial_sensor_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "content/browser/device_orientation/data_fetcher_shared_memory.h"
+#include "content/browser/device_sensors/data_fetcher_shared_memory.h"
 #include "content/public/browser/render_process_host.h"
 
 namespace content {
 
 DeviceInertialSensorService::DeviceInertialSensorService()
     : num_motion_readers_(0),
       num_orientation_readers_(0),
       is_shutdown_(false) {
 }
 
@@ skipping 26 matching lines @@
 
 bool DeviceInertialSensorService::ChangeNumberConsumers(
     ConsumerType consumer_type, int delta) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return false;
 
   switch (consumer_type) {
     case CONSUMER_TYPE_MOTION:
       num_motion_readers_ += delta;
-      DCHECK(num_motion_readers_ >= 0);
+      DCHECK_GE(num_motion_readers_, 0);
       return true;
     case CONSUMER_TYPE_ORIENTATION:
       num_orientation_readers_ += delta;
-      DCHECK(num_orientation_readers_ >= 0);
+      DCHECK_GE(num_orientation_readers_ , 0);
       return true;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 int DeviceInertialSensorService::GetNumberConsumers(
     ConsumerType consumer_type) const {
   switch (consumer_type) {
@@ skipping 18 matching lines @@
   data_fetcher_.reset();
   is_shutdown_ = true;
 }
 
 void DeviceInertialSensorService::SetDataFetcherForTests(
     DataFetcherSharedMemory* test_data_fetcher) {
   data_fetcher_.reset(test_data_fetcher);
 }
 
 }  // namespace content