| Index: device/capture/content/capture_resolution_chooser_unittest.cc
|
| diff --git a/media/capture/content/capture_resolution_chooser_unittest.cc b/device/capture/content/capture_resolution_chooser_unittest.cc
|
| similarity index 97%
|
| rename from media/capture/content/capture_resolution_chooser_unittest.cc
|
| rename to device/capture/content/capture_resolution_chooser_unittest.cc
|
| index a0346b1020c8f86e03089762683bac3b7afa30ea..7d61a1ad13dada9b18847220a3bf422c4faefa4d 100644
|
| --- a/media/capture/content/capture_resolution_chooser_unittest.cc
|
| +++ b/device/capture/content/capture_resolution_chooser_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/capture/content/capture_resolution_chooser.h"
|
| +#include "device/capture/content/capture_resolution_chooser.h"
|
|
|
| #include <stddef.h>
|
|
|
| @@ -12,7 +12,7 @@
|
|
|
| using tracked_objects::Location;
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| namespace {
|
|
|
| @@ -192,7 +192,7 @@ TEST(CaptureResolutionChooserTest,
|
| FixedResolutionPolicy_CaptureSizeAlwaysFixed) {
|
| const gfx::Size the_one_frame_size(kMaxFrameWidth, kMaxFrameHeight);
|
| CaptureResolutionChooser chooser(the_one_frame_size,
|
| - RESOLUTION_POLICY_FIXED_RESOLUTION);
|
| + media::RESOLUTION_POLICY_FIXED_RESOLUTION);
|
| EXPECT_EQ(the_one_frame_size, chooser.capture_size());
|
|
|
| chooser.SetSourceSize(the_one_frame_size);
|
| @@ -229,7 +229,7 @@ TEST(CaptureResolutionChooserTest,
|
| TEST(CaptureResolutionChooserTest,
|
| FixedAspectRatioPolicy_CaptureSizeHasSameAspectRatio) {
|
| CaptureResolutionChooser chooser(gfx::Size(kMaxFrameWidth, kMaxFrameHeight),
|
| - RESOLUTION_POLICY_FIXED_ASPECT_RATIO);
|
| + media::RESOLUTION_POLICY_FIXED_ASPECT_RATIO);
|
|
|
| // Starting condition.
|
| const gfx::Size min_size(kMinFrameWidth, kMinFrameHeight);
|
| @@ -301,7 +301,7 @@ TEST(CaptureResolutionChooserTest,
|
| AnyWithinLimitPolicy_CaptureSizeIsAnythingWithinLimits) {
|
| const gfx::Size max_size(kMaxFrameWidth, kMaxFrameHeight);
|
| CaptureResolutionChooser chooser(max_size,
|
| - RESOLUTION_POLICY_ANY_WITHIN_LIMIT);
|
| + media::RESOLUTION_POLICY_ANY_WITHIN_LIMIT);
|
|
|
| // Starting condition.
|
| EXPECT_EQ(max_size, chooser.capture_size());
|
| @@ -350,4 +350,4 @@ TEST(CaptureResolutionChooserTest,
|
| TestTargetedFrameAreas(&chooser, smallest_size);
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|