Clarify resolution change behaviors of video capture devices

media/video/capture/fake_video_capture_device_unittest.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/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "media/video/capture/fake_video_capture_device.h"
@@ skipping 116 matching lines @@
   scoped_ptr<VideoCaptureDevice> device(
       video_capture_device_factory_->Create(names->front()));
   ASSERT_TRUE(device);
 
   EXPECT_CALL(*client_, OnErr()).Times(0);
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(640, 480);
   capture_params.requested_format.frame_rate = 30;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
-  capture_params.allow_resolution_change = false;
   device->AllocateAndStart(capture_params, client_.PassAs<Client>());
   WaitForCapturedFrame();
   EXPECT_EQ(last_format().frame_size.width(), 640);
   EXPECT_EQ(last_format().frame_size.height(), 480);
   EXPECT_EQ(last_format().frame_rate, 30);
   device->StopAndDeAllocate();
 }
 
 TEST_F(FakeVideoCaptureDeviceTest, GetDeviceSupportedFormats) {
   scoped_ptr<VideoCaptureDevice::Names> names(EnumerateDevices());
@@ skipping 22 matching lines @@
 }
 
 // Disabled, http://crbug.com/407061 .
 TEST_F(FakeVideoCaptureDeviceTest, DISABLED_CaptureVariableResolution) {
   scoped_ptr<VideoCaptureDevice::Names> names(EnumerateDevices());
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(640, 480);
   capture_params.requested_format.frame_rate = 30;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
-  capture_params.allow_resolution_change = true;
+  capture_params.resolution_change_policy =
+      RESOLUTION_POLICY_DYNAMIC_WITHIN_LIMIT;
 
   ASSERT_GT(static_cast<int>(names->size()), 0);
 
   scoped_ptr<VideoCaptureDevice> device(
       video_capture_device_factory_->Create(names->front()));
   ASSERT_TRUE(device);
 
   // Configure the FakeVideoCaptureDevice to use all its formats as roster.
   VideoCaptureFormats formats;
   video_capture_device_factory_->GetDeviceSupportedFormats(names->front(),
                                                            &formats);
   static_cast<FakeVideoCaptureDevice*>(device.get())->
       PopulateVariableFormatsRoster(formats);
 
   EXPECT_CALL(*client_, OnErr())
       .Times(0);
   int action_count = 200;
 
   device->AllocateAndStart(capture_params, client_.PassAs<Client>());
 
   // We set TimeWait to 200 action timeouts and this should be enough for at
   // least action_count/kFakeCaptureCapabilityChangePeriod calls.
   for (int i = 0; i < action_count; ++i) {
     WaitForCapturedFrame();
   }
   device->StopAndDeAllocate();
 }
 
 };  // namespace media