Add '.mojom' suffix for battery mojom modules.

services/device/device_service.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 "services/device/device_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 77 matching lines @@
   registry_.AddInterface<mojom::LightSensor>(this);
   registry_.AddInterface<mojom::MotionSensor>(this);
   registry_.AddInterface<mojom::OrientationSensor>(this);
   registry_.AddInterface<mojom::OrientationAbsoluteSensor>(this);
   registry_.AddInterface<mojom::PowerMonitor>(this);
   registry_.AddInterface<mojom::ScreenOrientationListener>(this);
   registry_.AddInterface<mojom::TimeZoneMonitor>(this);
   registry_.AddInterface<mojom::WakeLockContextProvider>(this);
 
 #if defined(OS_ANDROID)
-  registry_.AddInterface(
-      GetJavaInterfaceProvider()->CreateInterfaceFactory<BatteryMonitor>());
+  registry_.AddInterface(GetJavaInterfaceProvider()
+                             ->CreateInterfaceFactory<mojom::BatteryMonitor>());
   registry_.AddInterface(
       GetJavaInterfaceProvider()
           ->CreateInterfaceFactory<mojom::VibrationManager>());
 #else
-  registry_.AddInterface<BatteryMonitor>(this);
+  registry_.AddInterface<mojom::BatteryMonitor>(this);
   registry_.AddInterface<mojom::VibrationManager>(this);
 #endif
 }
 
 void DeviceService::OnBindInterface(
     const service_manager::ServiceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe) {
   registry_.BindInterface(source_info.identity, interface_name,
                           std::move(interface_pipe));
 }
 
 #if !defined(OS_ANDROID)
 void DeviceService::Create(const service_manager::Identity& remote_identity,
-                           BatteryMonitorRequest request) {
-  device::BatteryMonitorImpl::Create(std::move(request));
+                           mojom::BatteryMonitorRequest request) {
+  BatteryMonitorImpl::Create(std::move(request));
 }
 
 void DeviceService::Create(const service_manager::Identity& remote_identity,
                            mojom::VibrationManagerRequest request) {
   VibrationManagerImpl::Create(std::move(request));
 }
 #endif
 
 void DeviceService::Create(const service_manager::Identity& remote_identity,
                            mojom::FingerprintRequest request) {
@@ skipping 110 matching lines @@
     java_interface_provider_.Bind(std::move(provider));
 
     java_interface_provider_initialized_ = true;
   }
 
   return &java_interface_provider_;
 }
 #endif
 
 }  // namespace device