[DeviceLight] Browser+java part

content/browser/device_sensors/device_inertial_sensor_browsertest.cc

 // 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.
 
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "content/browser/device_sensors/data_fetcher_shared_memory.h"
 #include "content/browser/device_sensors/device_inertial_sensor_service.h"
+#include "content/common/device_sensors/device_light_hardware_buffer.h"
 #include "content/common/device_sensors/device_motion_hardware_buffer.h"
 #include "content/common/device_sensors/device_orientation_hardware_buffer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
 
 namespace content {
 
 namespace {
 
 class FakeDataFetcher : public DataFetcherSharedMemory {
  public:
   FakeDataFetcher()
       : started_orientation_(false, false),
         stopped_orientation_(false, false),
         started_motion_(false, false),
         stopped_motion_(false, false),
-        sensor_data_available_(true) {
-  }
+        started_light_(false, false),
+        stopped_light_(false, false),
+        sensor_data_available_(true) {}
   virtual ~FakeDataFetcher() { }
 
   virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE {
     EXPECT_TRUE(buffer);
 
     switch (consumer_type) {
       case CONSUMER_TYPE_MOTION:
         {
           DeviceMotionHardwareBuffer* motion_buffer =
               static_cast<DeviceMotionHardwareBuffer*>(buffer);
           if (sensor_data_available_)
             UpdateMotion(motion_buffer);
           SetMotionBufferReady(motion_buffer);
           started_motion_.Signal();
         }
         break;
       case CONSUMER_TYPE_ORIENTATION:
         {
           DeviceOrientationHardwareBuffer* orientation_buffer =
               static_cast<DeviceOrientationHardwareBuffer*>(buffer);
           if (sensor_data_available_)
             UpdateOrientation(orientation_buffer);
           SetOrientationBufferReady(orientation_buffer);
           started_orientation_.Signal();
         }
         break;
+        case CONSUMER_TYPE_LIGHT: {

[timvolodine, 2014/07/16 15:39:38]

indentation

[riju_, 2014/07/18 15:59:17]

Done. I ran git cl format, and clang format did this.
But, lets keep consistency with the previous code.

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Loops_...

+          DeviceLightHardwareBuffer* light_buffer =
+              static_cast<DeviceLightHardwareBuffer*>(buffer);
+          if (sensor_data_available_)
+            UpdateLight(light_buffer);
+          started_light_.Signal();
+        } break;

[timvolodine, 2014/07/16 15:39:38]

break on new line

[riju_, 2014/07/18 15:59:17]

Done.

       default:
         return false;
     }
     return true;
   }
 
   virtual bool Stop(ConsumerType consumer_type) OVERRIDE {
     switch (consumer_type) {
       case CONSUMER_TYPE_MOTION:
         stopped_motion_.Signal();
         break;
       case CONSUMER_TYPE_ORIENTATION:
         stopped_orientation_.Signal();
         break;
+      case CONSUMER_TYPE_LIGHT:
+        stopped_light_.Signal();
+        break;
       default:
         return false;
     }
     return true;
   }
 
   virtual void Fetch(unsigned consumer_bitmask) OVERRIDE {
     FAIL() << "fetch should not be called";
   }
 
@@ skipping 50 matching lines @@
     buffer->data.alpha = 1;
     buffer->data.hasAlpha = true;
     buffer->data.beta = 2;
     buffer->data.hasBeta = true;
     buffer->data.gamma = 3;
     buffer->data.hasGamma = true;
     buffer->data.allAvailableSensorsAreActive = true;
     buffer->seqlock.WriteEnd();
   }
 
+  void UpdateLight(DeviceLightHardwareBuffer* buffer) {
+    buffer->seqlock.WriteBegin();
+    buffer->data.value = 100;
+    buffer->seqlock.WriteEnd();
+  }
+
   base::WaitableEvent started_orientation_;
   base::WaitableEvent stopped_orientation_;
   base::WaitableEvent started_motion_;
   base::WaitableEvent stopped_motion_;
+  base::WaitableEvent started_light_;
+  base::WaitableEvent stopped_light_;
   bool sensor_data_available_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeDataFetcher);
 };
 
 
 class DeviceInertialSensorBrowserTest : public ContentBrowserTest  {
  public:
   DeviceInertialSensorBrowserTest()
@@ skipping 31 matching lines @@
             delay));
     runner->Run();
   }
 
   FakeDataFetcher* fetcher_;
 
  private:
   base::WaitableEvent io_loop_finished_event_;
 };
 
+// TODO(riju) : Add light test

[timvolodine, 2014/07/16 15:39:38]

I think the browsertest should either be in a separate patch comlpetely or add a
test here.

[riju_, 2014/07/18 15:59:17]

Yes. I agree with you. I am renaming the "device_orientation" dir under
content/test/data to "device_sensors", hence did not want to pollute this CL. If
its not too much trouble for you/reviewers lets keep the browsertests in this
CL.

 
 IN_PROC_BROWSER_TEST_F(DeviceInertialSensorBrowserTest, OrientationTest) {
   // The test page will register an event handler for orientation events,
   // expects to get an event with fake values, then removes the event
   // handler and navigates to #pass.
   GURL test_url = GetTestUrl(
       "device_orientation", "device_orientation_test.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
 
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
@@ skipping 70 matching lines @@
 
   fetcher_->started_motion_.Wait();
   fetcher_->stopped_motion_.Wait();
   same_tab_observer.Wait();
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 }  //  namespace
 
 }  //  namespace content