Convert device_sensors to use mojo.

content/browser/device_sensors/data_fetcher_shared_memory_base.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_BROWSER_DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_BASE_H_
 #define CONTENT_BROWSER_DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_BASE_H_
 
 #include <map>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/device_sensors/device_sensors_consts.h"
 #include "content/common/content_export.h"
+#include "mojo/public/cpp/system/buffer.h"
 
 namespace content {
 
 // Sensor data fetchers should derive from this base class and implement
 // the abstract Start() and Stop() methods.
 // If the fetcher requires polling it should also implement IsPolling()
 // to return true and the Fetch() method which will be called from the
 // polling thread to fetch data at regular intervals.
 class CONTENT_EXPORT DataFetcherSharedMemoryBase {
  public:
   // Starts updating the shared memory buffer with sensor data at
   // regular intervals. Returns true if the relevant sensors could
   // be successfully activated.
   bool StartFetchingDeviceData(ConsumerType consumer_type);
 
   // Stops updating the shared memory buffer. Returns true if the
   // relevant sensors could be successfully deactivated.
   bool StopFetchingDeviceData(ConsumerType consumer_type);
 
   // Should be called before destruction to make sure all active
   // sensors are unregistered.
   virtual void Shutdown();
 
-  // Returns the shared memory handle of the device sensor data
-  // duplicated into the given process. This method should only be
-  // called after a call to StartFetchingDeviceData method with
+  // Returns the shared memory handle of the device sensor data. This method
+  // should only be called after a call to StartFetchingDeviceData method with
   // corresponding |consumer_type| parameter.
-  base::SharedMemoryHandle GetSharedMemoryHandleForProcess(
-      ConsumerType consumer_type, base::ProcessHandle process);
+  mojo::ScopedSharedBufferHandle GetSharedMemoryHandle(
+      ConsumerType consumer_type);
 
   enum FetcherType {
     // Fetcher runs on the same thread as its creator.
     FETCHER_TYPE_DEFAULT,
     // Fetcher runs on a separate thread calling |Fetch()| at regular intervals.
     FETCHER_TYPE_POLLING_CALLBACK,
     // Fetcher runs on a separate thread, but no callbacks are executed.
     FETCHER_TYPE_SEPARATE_THREAD
   };
 
@@ skipping 29 matching lines @@
 
  private:
   bool InitAndStartPollingThreadIfNecessary();
   base::SharedMemory* GetSharedMemory(ConsumerType consumer_type);
   void* GetSharedMemoryBuffer(ConsumerType consumer_type);
 
   unsigned started_consumers_;
 
   std::unique_ptr<PollingThread> polling_thread_;
 
-  // Owning pointers. Objects in the map are deleted in dtor.
-  typedef std::map<ConsumerType, base::SharedMemory*> SharedMemoryMap;
+  typedef std::map<ConsumerType,
+                   std::pair<mojo::ScopedSharedBufferHandle,
+                             mojo::ScopedSharedBufferMapping>>
+      SharedMemoryMap;

[dcheng, 2016/07/04 03:39:49]

Nit: since we're changing this, let's update it to use the preferred using
SharedMemoryMap = std::map<...>; syntax

[Sam McNally, 2016/07/04 08:31:38]

Done.

   SharedMemoryMap shared_memory_map_;
 
   DISALLOW_COPY_AND_ASSIGN(DataFetcherSharedMemoryBase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_BASE_H_