Fix race condition in DataFetcherSharedMemoryBase

content/browser/device_orientation/data_fetcher_shared_memory.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_SHARED_MEMORY_H_
 #define CONTENT_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_SHARED_MEMORY_H_
 
 #include "content/browser/device_orientation/data_fetcher_shared_memory_base.h"
 
-#if defined(OS_MACOSX)
+#if !defined(OS_ANDROID)
 #include "content/common/device_motion_hardware_buffer.h"
 #include "content/common/device_orientation/device_orientation_hardware_buffer.h"
+#endif
 
+#if defined(OS_MACOSX)
 class SuddenMotionSensor;
 #endif
 
 namespace content {
 
 class CONTENT_EXPORT DataFetcherSharedMemory
     : public DataFetcherSharedMemoryBase {
 
  public:
   DataFetcherSharedMemory();
   virtual ~DataFetcherSharedMemory();
 
  private:
-
-  virtual bool Start(ConsumerType consumer_type) OVERRIDE;
+  virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE;
   virtual bool Stop(ConsumerType consumer_type) OVERRIDE;
 
+#if !defined(OS_ANDROID)
+  DeviceMotionHardwareBuffer* motion_buffer_;
+  DeviceOrientationHardwareBuffer* orientation_buffer_;
+#endif
 #if defined(OS_MACOSX)
   virtual void Fetch(unsigned consumer_bitmask) OVERRIDE;
   virtual bool IsPolling() const OVERRIDE;
 
-  DeviceMotionHardwareBuffer* motion_buffer_;
-  DeviceOrientationHardwareBuffer* orientation_buffer_;
   scoped_ptr<SuddenMotionSensor> sudden_motion_sensor_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(DataFetcherSharedMemory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_SHARED_MEMORY_H_