[Sensors] Improvements in shared buffer managing

device/generic_sensor/sensor_provider_impl.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 "device/generic_sensor/sensor_provider_impl.h"
 
 #include <utility>
 
 #include "device/generic_sensor/platform_sensor_provider.h"
 #include "device/generic_sensor/sensor_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
 
 namespace {
 
-uint64_t GetBufferOffset(mojom::SensorType type) {
-  return (static_cast<uint64_t>(mojom::SensorType::LAST) -
-          static_cast<uint64_t>(type)) *
-         mojom::SensorInitParams::kReadBufferSize;
-}
-
 void RunCallback(mojom::SensorInitParamsPtr init_params,
                  SensorImpl* sensor,
                  const SensorProviderImpl::GetSensorCallback& callback) {
   callback.Run(std::move(init_params), sensor->GetClient());
 }
 
 void NotifySensorCreated(
     mojom::SensorInitParamsPtr init_params,
     SensorImpl* sensor,
     const SensorProviderImpl::GetSensorCallback& callback) {
@@ skipping 28 matching lines @@
     NotifySensorCreated(nullptr, nullptr, callback);
     return;
   }
 
   scoped_refptr<PlatformSensor> sensor = provider_->GetSensor(type);
   if (!sensor) {
     PlatformSensorProviderBase::CreateSensorCallback cb = base::Bind(
         &SensorProviderImpl::SensorCreated, weak_ptr_factory_.GetWeakPtr(),
         type, base::Passed(&cloned_handle), base::Passed(&sensor_request),
         callback);
-    provider_->CreateSensor(type, mojom::SensorInitParams::kReadBufferSize,
-                            GetBufferOffset(type), cb);
+    provider_->CreateSensor(type, cb);
     return;
   }
 
   SensorCreated(type, std::move(cloned_handle), std::move(sensor_request),
                 callback, std::move(sensor));
 }
 
 void SensorProviderImpl::SensorCreated(
     mojom::SensorType type,
     mojo::ScopedSharedBufferHandle cloned_handle,
     mojom::SensorRequest sensor_request,
     const GetSensorCallback& callback,
     scoped_refptr<PlatformSensor> sensor) {
   if (!sensor) {
     NotifySensorCreated(nullptr, nullptr, callback);
     return;
   }
 
   auto sensor_impl = base::MakeUnique<SensorImpl>(sensor);
 
   auto init_params = mojom::SensorInitParams::New();
   init_params->memory = std::move(cloned_handle);
-  init_params->buffer_offset = GetBufferOffset(type);
+  init_params->buffer_offset = SensorReadingSharedBuffer::GetOffset(type);
   init_params->mode = sensor->GetReportingMode();
   init_params->default_configuration = sensor->GetDefaultConfiguration();
 
   NotifySensorCreated(std::move(init_params), sensor_impl.get(), callback);
 
   mojo::MakeStrongBinding(std::move(sensor_impl), std::move(sensor_request));
 }
 
 }  // namespace device