Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / media_stream_dispatcher_unittest.cc

diff --git a/src/content/renderer/media/media_stream_dispatcher_unittest.cc b/src/content/renderer/media/media_stream_dispatcher_unittest.cc
index 85fe8d8..32acc88 100644 (file)
--- a/src/content/renderer/media/media_stream_dispatcher_unittest.cc
+++ b/src/content/renderer/media/media_stream_dispatcher_unittest.cc
@@ -37,11 +37,11 @@ class MockMediaStreamDispatcherEventHandler
   MockMediaStreamDispatcherEventHandler()
       : request_id_(-1) {}
 
-  virtual void OnStreamGenerated(
+  void OnStreamGenerated(
       int request_id,
-      const std::string &label,
+      const std::string& label,
       const StreamDeviceInfoArray& audio_device_array,
-      const StreamDeviceInfoArray& video_device_array) OVERRIDE {
+      const StreamDeviceInfoArray& video_device_array) override {
     request_id_ = request_id;
     label_ = label;
     if (audio_device_array.size()) {
@@ -54,14 +54,14 @@ class MockMediaStreamDispatcherEventHandler
     }
   }
 
-  virtual void OnStreamGenerationFailed(
+  void OnStreamGenerationFailed(
       int request_id,
-      content::MediaStreamRequestResult result) OVERRIDE {
+      content::MediaStreamRequestResult result) override {
     request_id_ = request_id;
   }
 
-  virtual void OnDeviceStopped(const std::string& label,
-                               const StreamDeviceInfo& device_info) OVERRIDE {
+  void OnDeviceStopped(const std::string& label,
+                       const StreamDeviceInfo& device_info) override {
     device_stopped_label_ = label;
     if (IsVideoMediaType(device_info.device.type)) {
       EXPECT_TRUE(StreamDeviceInfo::IsEqual(video_device_, device_info));
@@ -71,23 +71,19 @@ class MockMediaStreamDispatcherEventHandler
     }
   }
 
-  virtual void OnDevicesEnumerated(
-      int request_id,
-      const StreamDeviceInfoArray& device_array) OVERRIDE {
+  void OnDevicesEnumerated(int request_id,
+                           const StreamDeviceInfoArray& device_array) override {
     request_id_ = request_id;
   }
 
-  virtual void OnDeviceOpened(
-      int request_id,
-      const std::string& label,
-      const StreamDeviceInfo& video_device) OVERRIDE {
+  void OnDeviceOpened(int request_id,
+                      const std::string& label,
+                      const StreamDeviceInfo& video_device) override {
     request_id_ = request_id;
     label_ = label;
   }
 
-  virtual void OnDeviceOpenFailed(int request_id) OVERRIDE {
-    request_id_ = request_id;
-  }
+  void OnDeviceOpenFailed(int request_id) override { request_id_ = request_id; }
 
   void ResetStoredParameters() {
     request_id_ = -1;