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

Side by Side Diff: media/base/android/mock_android_overlay.cc

Issue 2856253004: removed AndroidOverlayFactory (Closed)
Patch Set: cl feedvback Created 3 years, 7 months 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "media/base/android/mock_android_overlay.h" 5 #include "media/base/android/mock_android_overlay.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h"
8 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
9 10
10 namespace media { 11 namespace media {
11 12
12 MockAndroidOverlay::Callbacks::Callbacks() = default; 13 MockAndroidOverlay::Callbacks::Callbacks() = default;
13 MockAndroidOverlay::Callbacks::Callbacks(const Callbacks&) = default; 14 MockAndroidOverlay::Callbacks::Callbacks(const Callbacks&) = default;
14 MockAndroidOverlay::Callbacks::~Callbacks() = default; 15 MockAndroidOverlay::Callbacks::~Callbacks() = default;
15 16
16 MockAndroidOverlay::MockAndroidOverlay() : weak_factory_(this) {} 17 MockAndroidOverlay::MockAndroidOverlay() : weak_factory_(this) {}
17 18
18 MockAndroidOverlay::~MockAndroidOverlay() {} 19 MockAndroidOverlay::~MockAndroidOverlay() {}
19 20
20 void MockAndroidOverlay::SetConfig(const Config& config) { 21 void MockAndroidOverlay::SetConfig(AndroidOverlayConfig config) {
21 config_ = config; 22 config_ = base::MakeUnique<AndroidOverlayConfig>(std::move(config));
22 } 23 }
23 24
24 MockAndroidOverlay::Callbacks MockAndroidOverlay::GetCallbacks() { 25 MockAndroidOverlay::Callbacks MockAndroidOverlay::GetCallbacks() {
25 Callbacks c; 26 Callbacks c;
26 c.OverlayReady = base::Bind(&MockAndroidOverlay::OnOverlayReady, 27 c.OverlayReady = base::Bind(&MockAndroidOverlay::OnOverlayReady,
27 weak_factory_.GetWeakPtr()); 28 weak_factory_.GetWeakPtr());
28 c.OverlayFailed = base::Bind(&MockAndroidOverlay::OnOverlayFailed, 29 c.OverlayFailed = base::Bind(&MockAndroidOverlay::OnOverlayFailed,
29 weak_factory_.GetWeakPtr()); 30 weak_factory_.GetWeakPtr());
30 c.SurfaceDestroyed = base::Bind(&MockAndroidOverlay::OnSurfaceDestroyed, 31 c.SurfaceDestroyed = base::Bind(&MockAndroidOverlay::OnSurfaceDestroyed,
31 weak_factory_.GetWeakPtr()); 32 weak_factory_.GetWeakPtr());
32 33
33 return c; 34 return c;
34 } 35 }
35 36
36 void MockAndroidOverlay::OnOverlayReady() { 37 void MockAndroidOverlay::OnOverlayReady() {
37 config_.ready_cb.Run(this); 38 config_->is_ready(this);
38 } 39 }
39 40
40 void MockAndroidOverlay::OnOverlayFailed() { 41 void MockAndroidOverlay::OnOverlayFailed() {
41 config_.failed_cb.Run(this); 42 config_->is_failed(this);
42 } 43 }
43 44
44 void MockAndroidOverlay::OnSurfaceDestroyed() { 45 void MockAndroidOverlay::OnSurfaceDestroyed() {
45 config_.destroyed_cb.Run(this); 46 config_->is_destroyed(this);
46 } 47 }
47 48
48 } // namespace media 49 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698