Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: services/video_capture/test/mock_device_test.cc

Issue 2589663003: mojo:: Rename mojo::GetProxy() to mojo::MakeRequest() (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "services/video_capture/test/mock_device_test.h" 5 #include "services/video_capture/test/mock_device_test.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "media/capture/video/video_capture_jpeg_decoder.h" 8 #include "media/capture/video/video_capture_jpeg_decoder.h"
9 9
10 namespace { 10 namespace {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 auto mock_device_factory = base::MakeUnique<MockDeviceFactory>(); 48 auto mock_device_factory = base::MakeUnique<MockDeviceFactory>();
49 // We keep a pointer to the MockDeviceFactory as a member so that we can 49 // We keep a pointer to the MockDeviceFactory as a member so that we can
50 // invoke its AddMockDevice(). Ownership of the MockDeviceFactory is moved 50 // invoke its AddMockDevice(). Ownership of the MockDeviceFactory is moved
51 // to the DeviceFactoryMediaToMojoAdapter. 51 // to the DeviceFactoryMediaToMojoAdapter.
52 mock_device_factory_ = mock_device_factory.get(); 52 mock_device_factory_ = mock_device_factory.get();
53 mock_device_factory_adapter_ = 53 mock_device_factory_adapter_ =
54 base::MakeUnique<DeviceFactoryMediaToMojoAdapter>( 54 base::MakeUnique<DeviceFactoryMediaToMojoAdapter>(
55 std::move(mock_device_factory), base::Bind(CreateJpegDecoder)); 55 std::move(mock_device_factory), base::Bind(CreateJpegDecoder));
56 56
57 mock_factory_binding_ = base::MakeUnique<mojo::Binding<mojom::DeviceFactory>>( 57 mock_factory_binding_ = base::MakeUnique<mojo::Binding<mojom::DeviceFactory>>(
58 mock_device_factory_adapter_.get(), mojo::GetProxy(&factory_)); 58 mock_device_factory_adapter_.get(), mojo::MakeRequest(&factory_));
59 59
60 media::VideoCaptureDeviceDescriptor mock_descriptor; 60 media::VideoCaptureDeviceDescriptor mock_descriptor;
61 mock_descriptor.device_id = "MockDeviceId"; 61 mock_descriptor.device_id = "MockDeviceId";
62 mock_device_factory_->AddMockDevice(&mock_device_, mock_descriptor); 62 mock_device_factory_->AddMockDevice(&mock_device_, mock_descriptor);
63 63
64 // Obtain the mock device from the factory 64 // Obtain the mock device from the factory
65 factory_->CreateDevice( 65 factory_->CreateDevice(
66 mock_descriptor.device_id, mojo::GetProxy(&device_proxy_), 66 mock_descriptor.device_id, mojo::MakeRequest(&device_proxy_),
67 base::Bind([](mojom::DeviceAccessResultCode result_code) {})); 67 base::Bind([](mojom::DeviceAccessResultCode result_code) {}));
68 68
69 requested_settings_.format.frame_size = gfx::Size(800, 600); 69 requested_settings_.format.frame_size = gfx::Size(800, 600);
70 requested_settings_.format.frame_rate = 15; 70 requested_settings_.format.frame_rate = 15;
71 requested_settings_.resolution_change_policy = 71 requested_settings_.resolution_change_policy =
72 media::RESOLUTION_POLICY_FIXED_RESOLUTION; 72 media::RESOLUTION_POLICY_FIXED_RESOLUTION;
73 requested_settings_.power_line_frequency = 73 requested_settings_.power_line_frequency =
74 media::PowerLineFrequency::FREQUENCY_DEFAULT; 74 media::PowerLineFrequency::FREQUENCY_DEFAULT;
75 75
76 mock_receiver_ = 76 mock_receiver_ =
77 base::MakeUnique<MockReceiver>(mojo::GetProxy(&mock_receiver_proxy_)); 77 base::MakeUnique<MockReceiver>(mojo::MakeRequest(&mock_receiver_proxy_));
78 } 78 }
79 79
80 } // namespace video_capture 80 } // namespace video_capture
OLDNEW
« no previous file with comments | « services/video_capture/test/fake_device_unittest.cc ('k') | services/video_capture/test/service_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698