Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / device_sensors / device_inertial_sensor_browsertest.cc

diff --git a/src/content/browser/device_sensors/device_inertial_sensor_browsertest.cc b/src/content/browser/device_sensors/device_inertial_sensor_browsertest.cc
index 4fc83c2..3380d8a 100644 (file)
--- a/src/content/browser/device_sensors/device_inertial_sensor_browsertest.cc
+++ b/src/content/browser/device_sensors/device_inertial_sensor_browsertest.cc
@@ -34,9 +34,9 @@ class FakeDataFetcher : public DataFetcherSharedMemory {
         started_light_(false, false),
         stopped_light_(false, false),
         sensor_data_available_(true) {}
-  virtual ~FakeDataFetcher() { }
+  ~FakeDataFetcher() override {}
 
-  virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE {
+  bool Start(ConsumerType consumer_type, void* buffer) override {
     EXPECT_TRUE(buffer);
 
     switch (consumer_type) {
@@ -77,7 +77,7 @@ class FakeDataFetcher : public DataFetcherSharedMemory {
     return true;
   }
 
-  virtual bool Stop(ConsumerType consumer_type) OVERRIDE {
+  bool Stop(ConsumerType consumer_type) override {
     switch (consumer_type) {
       case CONSUMER_TYPE_MOTION:
         stopped_motion_.Signal();
@@ -94,13 +94,11 @@ class FakeDataFetcher : public DataFetcherSharedMemory {
     return true;
   }
 
-  virtual void Fetch(unsigned consumer_bitmask) OVERRIDE {
+  void Fetch(unsigned consumer_bitmask) override {
     FAIL() << "fetch should not be called";
   }
 
-  virtual FetcherType GetType() const OVERRIDE {
-    return FETCHER_TYPE_DEFAULT;
-  }
+  FetcherType GetType() const override { return FETCHER_TYPE_DEFAULT; }
 
   void SetSensorDataAvailable(bool available) {
     sensor_data_available_ = available;
@@ -184,7 +182,7 @@ class DeviceInertialSensorBrowserTest : public ContentBrowserTest  {
         io_loop_finished_event_(false, false) {
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  void SetUpOnMainThread() override {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&DeviceInertialSensorBrowserTest::SetUpOnIOThread, this));
@@ -326,7 +324,7 @@ IN_PROC_BROWSER_TEST_F(DeviceInertialSensorBrowserTest,
 }
 
 // Flaking in the android try bot. See http://crbug.com/360578.
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_WIN)
 #define MAYBE_MotionNullTestWithAlert DISABLED_MotionNullTestWithAlert
 #else
 #define MAYBE_MotionNullTestWithAlert MotionNullTestWithAlert