| Index: remoting/host/resizing_host_observer_unittest.cc
|
| diff --git a/remoting/host/resizing_host_observer_unittest.cc b/remoting/host/resizing_host_observer_unittest.cc
|
| index 9941a1b357d1904e798f172170d4cd8c96176e96..f25465afbc2bf879a4ea8d442b66a33a1989194e 100644
|
| --- a/remoting/host/resizing_host_observer_unittest.cc
|
| +++ b/remoting/host/resizing_host_observer_unittest.cc
|
| @@ -92,7 +92,7 @@ class FakeDesktopResizer : public DesktopResizer {
|
| class ResizingHostObserverTest : public testing::Test {
|
| public:
|
| ResizingHostObserverTest()
|
| - : desktop_resizer_(NULL),
|
| + : desktop_resizer_(nullptr),
|
| now_(base::Time::Now()) {
|
| }
|
|
|
| @@ -145,10 +145,10 @@ TEST_F(ResizingHostObserverTest, NoRestoreResolution) {
|
| int restore_resolution_call_count = 0;
|
| ScreenResolution initial = MakeResolution(640, 480);
|
| scoped_ptr<FakeDesktopResizer> desktop_resizer(
|
| - new FakeDesktopResizer(initial, false, NULL, 0,
|
| + new FakeDesktopResizer(initial, false, nullptr, 0,
|
| &restore_resolution_call_count));
|
| SetDesktopResizer(desktop_resizer.Pass());
|
| - VerifySizes(NULL, NULL, 0);
|
| + VerifySizes(nullptr, nullptr, 0);
|
| resizing_host_observer_.reset();
|
| EXPECT_EQ(0, restore_resolution_call_count);
|
| }
|
| @@ -159,7 +159,7 @@ TEST_F(ResizingHostObserverTest, EmptyGetSupportedSizes) {
|
| int restore_resolution_call_count = 0;
|
| ScreenResolution initial = MakeResolution(640, 480);
|
| scoped_ptr<FakeDesktopResizer> desktop_resizer(
|
| - new FakeDesktopResizer(initial, false, NULL, 0,
|
| + new FakeDesktopResizer(initial, false, nullptr, 0,
|
| &restore_resolution_call_count));
|
| SetDesktopResizer(desktop_resizer.Pass());
|
|
|
| @@ -176,7 +176,7 @@ TEST_F(ResizingHostObserverTest, EmptyGetSupportedSizes) {
|
| TEST_F(ResizingHostObserverTest, SelectExactSize) {
|
| int restore_resolution_call_count = 0;
|
| scoped_ptr<FakeDesktopResizer> desktop_resizer(
|
| - new FakeDesktopResizer(MakeResolution(640, 480), true, NULL, 0,
|
| + new FakeDesktopResizer(MakeResolution(640, 480), true, nullptr, 0,
|
| &restore_resolution_call_count));
|
| SetDesktopResizer(desktop_resizer.Pass());
|
|
|
| @@ -198,7 +198,7 @@ TEST_F(ResizingHostObserverTest, SelectBestSmallerSize) {
|
| scoped_ptr<FakeDesktopResizer> desktop_resizer(
|
| new FakeDesktopResizer(MakeResolution(640, 480), false,
|
| supported_sizes, arraysize(supported_sizes),
|
| - NULL));
|
| + nullptr));
|
| SetDesktopResizer(desktop_resizer.Pass());
|
|
|
| ScreenResolution client_sizes[] = { MakeResolution(639, 479),
|
| @@ -218,7 +218,7 @@ TEST_F(ResizingHostObserverTest, SelectBestScaleFactor) {
|
| scoped_ptr<FakeDesktopResizer> desktop_resizer(
|
| new FakeDesktopResizer(MakeResolution(200, 100), false,
|
| supported_sizes, arraysize(supported_sizes),
|
| - NULL));
|
| + nullptr));
|
| SetDesktopResizer(desktop_resizer.Pass());
|
|
|
| ScreenResolution client_sizes[] = { MakeResolution(1, 1),
|
| @@ -237,7 +237,7 @@ TEST_F(ResizingHostObserverTest, SelectWidest) {
|
| scoped_ptr<FakeDesktopResizer> desktop_resizer(
|
| new FakeDesktopResizer(MakeResolution(480, 640), false,
|
| supported_sizes, arraysize(supported_sizes),
|
| - NULL));
|
| + nullptr));
|
| SetDesktopResizer(desktop_resizer.Pass());
|
|
|
| ScreenResolution client_sizes[] = { MakeResolution(100, 100),
|
| @@ -258,7 +258,7 @@ TEST_F(ResizingHostObserverTest, NoSetSizeForSameSize) {
|
| MakeResolution(480, 640) };
|
| SetDesktopResizer(make_scoped_ptr(new FakeDesktopResizer(
|
| MakeResolution(480, 640), false,
|
| - supported_sizes, arraysize(supported_sizes), NULL)));
|
| + supported_sizes, arraysize(supported_sizes), nullptr)));
|
|
|
| ScreenResolution client_sizes[] = { MakeResolution(640, 640),
|
| MakeResolution(1024, 768),
|
| @@ -273,8 +273,8 @@ TEST_F(ResizingHostObserverTest, NoSetSizeForSameSize) {
|
| // Check that desktop resizes are rate-limited, and that if multiple resize
|
| // requests are received in the time-out period, the most recent is respected.
|
| TEST_F(ResizingHostObserverTest, RateLimited) {
|
| - SetDesktopResizer(make_scoped_ptr(
|
| - new FakeDesktopResizer(MakeResolution(640, 480), true, NULL, 0, NULL)));
|
| + SetDesktopResizer(make_scoped_ptr(new FakeDesktopResizer(
|
| + MakeResolution(640, 480), true, nullptr, 0, nullptr)));
|
| resizing_host_observer_->SetNowFunctionForTesting(
|
| base::Bind(&ResizingHostObserverTest::GetTime, base::Unretained(this)));
|
|
|
|
|