[sensors](CrOS/Linux) Rename SensorDeviceManager cc and h files.

It is a followup patch to https://codereview.chromium.org/2533793002/ In addition to renaming this CL fixes a typo in code where sensor cache in erased. BUG=606766 Review-Url: https://codereview.chromium.org/2560263002 Cr-Commit-Position: refs/heads/master@{#437778}
Denger-Network · Dec 10, 2016 · fac225c · fac225c
1 parent 3c957a5
commit fac225c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/device/generic_sensor/BUILD.gn b/device/generic_sensor/BUILD.gn
@@ -77,8 +77,8 @@ component("generic_sensor") {
     ]
 
     sources += [
-      "linux/platform_sensor_manager.cc",
-      "linux/platform_sensor_manager.h",
+      "linux/sensor_device_manager.cc",
+      "linux/sensor_device_manager.h",
       "platform_sensor_provider_linux.cc",
       "platform_sensor_provider_linux.h",
     ]

diff --git a/...c_sensor/linux/platform_sensor_manager.cc → ...ric_sensor/linux/sensor_device_manager.cc b/...c_sensor/linux/platform_sensor_manager.cc → ...ric_sensor/linux/sensor_device_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/generic_sensor/linux/platform_sensor_manager.h"
+#include "device/generic_sensor/linux/sensor_device_manager.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"

diff --git a/...ic_sensor/linux/platform_sensor_manager.h → ...eric_sensor/linux/sensor_device_manager.h b/...ic_sensor/linux/platform_sensor_manager.h → ...eric_sensor/linux/sensor_device_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_GENERIC_SENSOR_LINUX_PLATFORM_SENSOR_MANAGER_H_
-#define DEVICE_GENERIC_SENSOR_LINUX_PLATFORM_SENSOR_MANAGER_H_
+#ifndef DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_
+#define DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_
 
 #include "base/scoped_observer.h"
 
@@ -80,4 +80,4 @@ class DEVICE_GENERIC_SENSOR_EXPORT SensorDeviceManager
 
 }  // namespace device
 
-#endif  // DEVICE_GENERIC_SENSOR_LINUX_PLATFORM_SENSOR_MANAGER_H_
+#endif  // DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_
diff --git a/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc b/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
@@ -10,8 +10,8 @@
 #include "base/strings/string_util.h"
 
 #include "device/generic_sensor/generic_sensor_consts.h"
-#include "device/generic_sensor/linux/platform_sensor_manager.h"
 #include "device/generic_sensor/linux/sensor_data_linux.h"
+#include "device/generic_sensor/linux/sensor_device_manager.h"
 #include "device/generic_sensor/platform_sensor_provider_linux.h"
 
 #include "testing/gmock/include/gmock/gmock.h"

diff --git a/device/generic_sensor/platform_sensor_provider_linux.cc b/device/generic_sensor/platform_sensor_provider_linux.cc
@@ -202,7 +202,7 @@ void PlatformSensorProviderLinux::OnDeviceRemoved(
     const std::string& device_node) {
   DCHECK(CalledOnValidThread());
   auto it = sensor_devices_by_type_.find(type);
-  if (it == sensor_devices_by_type_.end() &&
+  if (it != sensor_devices_by_type_.end() &&
       it->second->device_node == device_node)
     sensor_devices_by_type_.erase(it);
 }

diff --git a/device/generic_sensor/platform_sensor_provider_linux.h b/device/generic_sensor/platform_sensor_provider_linux.h
@@ -7,7 +7,7 @@
 
 #include "device/generic_sensor/platform_sensor_provider.h"
 
-#include "device/generic_sensor/linux/platform_sensor_manager.h"
+#include "device/generic_sensor/linux/sensor_device_manager.h"
 
 namespace base {
 template <typename T>