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

Side by Side Diff: chromecast/browser/test/cast_media_blocker_test.cc

Issue 2450433002: Let CastMediaBlocker observe MediaSession instead of WebContents (Closed)
Patch Set: fixed tests Created 4 years, 1 month 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 "chromecast/browser/cast_media_blocker.h" 5 #include "chromecast/browser/cast_media_blocker.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "content/public/browser/media_session.h"
11 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
12 #include "content/public/test/test_content_client_initializer.h" 13 #include "content/public/test/test_content_client_initializer.h"
13 #include "content/public/test/test_renderer_host.h" 14 #include "content/public/test/test_renderer_host.h"
14 #include "content/public/test/web_contents_tester.h" 15 #include "content/public/test/web_contents_tester.h"
15 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
17 18
18 namespace chromecast { 19 namespace chromecast {
19 namespace shell { 20 namespace shell {
20 21
21 class MockMediaSession { 22 class MockMediaSession : public content::MediaSession {
22 public: 23 public:
23 MockMediaSession() {} 24 MockMediaSession() {}
24 ~MockMediaSession() {} 25 ~MockMediaSession() {}
25 26
26 MOCK_CONST_METHOD0(Suspend, void()); 27 MOCK_METHOD1(Resume, void(content::MediaSession::SuspendType));
27 MOCK_CONST_METHOD0(Resume, void()); 28 MOCK_METHOD1(Suspend, void(content::MediaSession::SuspendType));
29 MOCK_METHOD1(Stop, void(content::MediaSession::SuspendType));
28 30
29 private: 31 private:
30 DISALLOW_COPY_AND_ASSIGN(MockMediaSession); 32 DISALLOW_COPY_AND_ASSIGN(MockMediaSession);
31 }; 33 };
32 34
33 class CastMediaBlockerTest : public content::RenderViewHostTestHarness { 35 class CastMediaBlockerTest : public content::RenderViewHostTestHarness {
34 public: 36 public:
35 CastMediaBlockerTest() {} 37 CastMediaBlockerTest() {}
36 ~CastMediaBlockerTest() override {} 38 ~CastMediaBlockerTest() override {}
37 39
38 void SetUp() override { 40 void SetUp() override {
39 initializer_ = base::MakeUnique<content::TestContentClientInitializer>(); 41 initializer_ = base::MakeUnique<content::TestContentClientInitializer>();
40 content::RenderViewHostTestHarness::SetUp(); 42 content::RenderViewHostTestHarness::SetUp();
41 media_session_ = base::MakeUnique<MockMediaSession>(); 43 media_session_ = base::MakeUnique<MockMediaSession>();
42 media_blocker_ = base::MakeUnique<CastMediaBlocker>( 44 media_blocker_ = base::MakeUnique<CastMediaBlocker>(
43 web_contents(), base::Bind(&MockMediaSession::Suspend, 45 media_session_.get(),
44 base::Unretained(media_session_.get())), 46 base::Bind(&MockMediaSession::Suspend,
47 base::Unretained(media_session_.get()),
48 content::MediaSession::SuspendType::SYSTEM),
45 base::Bind(&MockMediaSession::Resume, 49 base::Bind(&MockMediaSession::Resume,
46 base::Unretained(media_session_.get()))); 50 base::Unretained(media_session_.get()),
51 content::MediaSession::SuspendType::SYSTEM));
47 52
48 content::WebContentsTester::For(web_contents()) 53 content::WebContentsTester::For(web_contents())
49 ->NavigateAndCommit(GURL("https://www.youtube.com")); 54 ->NavigateAndCommit(GURL("https://www.youtube.com"));
50 } 55 }
51 56
52 void TearDown() override { content::RenderViewHostTestHarness::TearDown(); } 57 void TearDown() override { content::RenderViewHostTestHarness::TearDown(); }
53 58
54 void MediaSessionChanged(bool controllable, bool suspended) { 59 void MediaSessionChanged(bool controllable, bool suspended) {
55 media_blocker_->MediaSessionStateChanged(controllable, suspended); 60 media_blocker_->MediaSessionStateChanged(controllable, suspended);
56 } 61 }
57 62
58 protected: 63 protected:
59 std::unique_ptr<content::TestContentClientInitializer> initializer_; 64 std::unique_ptr<content::TestContentClientInitializer> initializer_;
60 std::unique_ptr<MockMediaSession> media_session_; 65 std::unique_ptr<MockMediaSession> media_session_;
61 std::unique_ptr<CastMediaBlocker> media_blocker_; 66 std::unique_ptr<CastMediaBlocker> media_blocker_;
62 67
63 private: 68 private:
64 DISALLOW_COPY_AND_ASSIGN(CastMediaBlockerTest); 69 DISALLOW_COPY_AND_ASSIGN(CastMediaBlockerTest);
65 }; 70 };
66 71
72 using ::testing::_;
73
67 TEST_F(CastMediaBlockerTest, Block_Unblock_Suspended) { 74 TEST_F(CastMediaBlockerTest, Block_Unblock_Suspended) {
68 // Testing block/unblock operations do nothing if media never plays. 75 // Testing block/unblock operations do nothing if media never plays.
69 EXPECT_CALL(*media_session_, Suspend()).Times(0); 76 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
70 EXPECT_CALL(*media_session_, Resume()).Times(0); 77 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
71 media_blocker_->BlockMediaLoading(true); 78 media_blocker_->BlockMediaLoading(true);
72 media_blocker_->BlockMediaLoading(false); 79 media_blocker_->BlockMediaLoading(false);
73 80
74 MediaSessionChanged(true, true); 81 MediaSessionChanged(true, true);
75 media_blocker_->BlockMediaLoading(true); 82 media_blocker_->BlockMediaLoading(true);
76 media_blocker_->BlockMediaLoading(false); 83 media_blocker_->BlockMediaLoading(false);
77 84
78 media_blocker_->BlockMediaLoading(true); 85 media_blocker_->BlockMediaLoading(true);
79 MediaSessionChanged(false, true); 86 MediaSessionChanged(false, true);
80 media_blocker_->BlockMediaLoading(false); 87 media_blocker_->BlockMediaLoading(false);
81 } 88 }
82 89
83 TEST_F(CastMediaBlockerTest, No_Block) { 90 TEST_F(CastMediaBlockerTest, No_Block) {
84 // Tests CastMediaBlocker does nothing if block/unblock is not called. 91 // Tests CastMediaBlocker does nothing if block/unblock is not called.
85 EXPECT_CALL(*media_session_, Suspend()).Times(0); 92 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
86 EXPECT_CALL(*media_session_, Resume()).Times(0); 93 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
87 94
88 // Media becomes controllable/uncontrollable. 95 // Media becomes controllable/uncontrollable.
89 MediaSessionChanged(true, true); 96 MediaSessionChanged(true, true);
90 MediaSessionChanged(false, true); 97 MediaSessionChanged(false, true);
91 98
92 // Media starts and stops. 99 // Media starts and stops.
93 MediaSessionChanged(false, false); 100 MediaSessionChanged(false, false);
94 MediaSessionChanged(false, true); 101 MediaSessionChanged(false, true);
95 102
96 // Media starts, changes controllability and stops. 103 // Media starts, changes controllability and stops.
97 MediaSessionChanged(false, false); 104 MediaSessionChanged(false, false);
98 MediaSessionChanged(true, false); 105 MediaSessionChanged(true, false);
99 MediaSessionChanged(false, false); 106 MediaSessionChanged(false, false);
100 MediaSessionChanged(false, true); 107 MediaSessionChanged(false, true);
101 108
102 // Media starts, changes controllability and stops. 109 // Media starts, changes controllability and stops.
103 MediaSessionChanged(false, false); 110 MediaSessionChanged(false, false);
104 MediaSessionChanged(true, false); 111 MediaSessionChanged(true, false);
105 MediaSessionChanged(true, true); 112 MediaSessionChanged(true, true);
106 } 113 }
107 114
108 TEST_F(CastMediaBlockerTest, Block_Before_Controllable) { 115 TEST_F(CastMediaBlockerTest, Block_Before_Controllable) {
109 // Tests CastMediaBlocker only suspends when controllable. 116 // Tests CastMediaBlocker only suspends when controllable.
110 EXPECT_CALL(*media_session_, Suspend()).Times(0); 117 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
111 EXPECT_CALL(*media_session_, Resume()).Times(0); 118 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
112 media_blocker_->BlockMediaLoading(true); 119 media_blocker_->BlockMediaLoading(true);
113 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 120 testing::Mock::VerifyAndClearExpectations(media_session_.get());
114 121
115 // Session becomes controllable 122 // Session becomes controllable
116 EXPECT_CALL(*media_session_, Suspend()).Times(1); 123 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
117 EXPECT_CALL(*media_session_, Resume()).Times(0); 124 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
118 MediaSessionChanged(true, false); 125 MediaSessionChanged(true, false);
119 } 126 }
120 127
121 TEST_F(CastMediaBlockerTest, Block_After_Controllable) { 128 TEST_F(CastMediaBlockerTest, Block_After_Controllable) {
122 // Tests CastMediaBlocker suspends immediately on block if controllable. 129 // Tests CastMediaBlocker suspends immediately on block if controllable.
123 EXPECT_CALL(*media_session_, Suspend()).Times(0); 130 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
124 EXPECT_CALL(*media_session_, Resume()).Times(0); 131 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
125 MediaSessionChanged(true, false); 132 MediaSessionChanged(true, false);
126 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 133 testing::Mock::VerifyAndClearExpectations(media_session_.get());
127 134
128 // Block when media is playing 135 // Block when media is playing
129 EXPECT_CALL(*media_session_, Suspend()).Times(1); 136 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
130 EXPECT_CALL(*media_session_, Resume()).Times(0); 137 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
131 media_blocker_->BlockMediaLoading(true); 138 media_blocker_->BlockMediaLoading(true);
132 MediaSessionChanged(true, true); 139 MediaSessionChanged(true, true);
133 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 140 testing::Mock::VerifyAndClearExpectations(media_session_.get());
134 141
135 // Unblock 142 // Unblock
136 EXPECT_CALL(*media_session_, Suspend()).Times(0); 143 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
137 EXPECT_CALL(*media_session_, Resume()).Times(1); 144 EXPECT_CALL(*media_session_, Resume(_)).Times(1);
138 media_blocker_->BlockMediaLoading(false); 145 media_blocker_->BlockMediaLoading(false);
139 } 146 }
140 147
141 TEST_F(CastMediaBlockerTest, Block_Multiple) { 148 TEST_F(CastMediaBlockerTest, Block_Multiple) {
142 // Tests CastMediaBlocker repeatively suspends when blocked. 149 // Tests CastMediaBlocker repeatively suspends when blocked.
143 EXPECT_CALL(*media_session_, Suspend()).Times(0); 150 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
144 EXPECT_CALL(*media_session_, Resume()).Times(0); 151 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
145 media_blocker_->BlockMediaLoading(true); 152 media_blocker_->BlockMediaLoading(true);
146 MediaSessionChanged(false, false); 153 MediaSessionChanged(false, false);
147 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 154 testing::Mock::VerifyAndClearExpectations(media_session_.get());
148 155
149 EXPECT_CALL(*media_session_, Suspend()).Times(1); 156 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
150 EXPECT_CALL(*media_session_, Resume()).Times(0); 157 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
151 MediaSessionChanged(true, false); 158 MediaSessionChanged(true, false);
152 MediaSessionChanged(true, true); 159 MediaSessionChanged(true, true);
153 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 160 testing::Mock::VerifyAndClearExpectations(media_session_.get());
154 161
155 EXPECT_CALL(*media_session_, Suspend()).Times(1); 162 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
156 EXPECT_CALL(*media_session_, Resume()).Times(0); 163 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
157 MediaSessionChanged(true, false); 164 MediaSessionChanged(true, false);
158 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 165 testing::Mock::VerifyAndClearExpectations(media_session_.get());
159 MediaSessionChanged(true, true); 166 MediaSessionChanged(true, true);
160 167
161 EXPECT_CALL(*media_session_, Suspend()).Times(0); 168 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
162 EXPECT_CALL(*media_session_, Resume()).Times(0); 169 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
163 MediaSessionChanged(false, true); 170 MediaSessionChanged(false, true);
164 MediaSessionChanged(false, false); 171 MediaSessionChanged(false, false);
165 MediaSessionChanged(false, true); 172 MediaSessionChanged(false, true);
166 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 173 testing::Mock::VerifyAndClearExpectations(media_session_.get());
167 } 174 }
168 175
169 TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable) { 176 TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable) {
170 // Tests CastMediaBlocker does not suspend or resume when uncontrollable. 177 // Tests CastMediaBlocker does not suspend or resume when uncontrollable.
171 EXPECT_CALL(*media_session_, Suspend()).Times(0); 178 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
172 EXPECT_CALL(*media_session_, Resume()).Times(0); 179 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
173 media_blocker_->BlockMediaLoading(true); 180 media_blocker_->BlockMediaLoading(true);
174 MediaSessionChanged(false, false); 181 MediaSessionChanged(false, false);
175 media_blocker_->BlockMediaLoading(false); 182 media_blocker_->BlockMediaLoading(false);
176 media_blocker_->BlockMediaLoading(true); 183 media_blocker_->BlockMediaLoading(true);
177 MediaSessionChanged(false, true); 184 MediaSessionChanged(false, true);
178 media_blocker_->BlockMediaLoading(false); 185 media_blocker_->BlockMediaLoading(false);
179 media_blocker_->BlockMediaLoading(true); 186 media_blocker_->BlockMediaLoading(true);
180 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 187 testing::Mock::VerifyAndClearExpectations(media_session_.get());
181 } 188 }
182 189
183 TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable2) { 190 TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable2) {
184 EXPECT_CALL(*media_session_, Suspend()).Times(1); 191 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
185 EXPECT_CALL(*media_session_, Resume()).Times(0); 192 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
186 MediaSessionChanged(true, true); 193 MediaSessionChanged(true, true);
187 media_blocker_->BlockMediaLoading(true); 194 media_blocker_->BlockMediaLoading(true);
188 MediaSessionChanged(false, true); 195 MediaSessionChanged(false, true);
189 MediaSessionChanged(true, true); 196 MediaSessionChanged(true, true);
190 MediaSessionChanged(true, false); 197 MediaSessionChanged(true, false);
191 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 198 testing::Mock::VerifyAndClearExpectations(media_session_.get());
192 199
193 EXPECT_CALL(*media_session_, Suspend()).Times(1); 200 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
194 EXPECT_CALL(*media_session_, Resume()).Times(0); 201 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
195 MediaSessionChanged(false, false); 202 MediaSessionChanged(false, false);
196 MediaSessionChanged(false, true); 203 MediaSessionChanged(false, true);
197 MediaSessionChanged(true, true); 204 MediaSessionChanged(true, true);
198 MediaSessionChanged(true, false); 205 MediaSessionChanged(true, false);
199 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 206 testing::Mock::VerifyAndClearExpectations(media_session_.get());
200 207
201 EXPECT_CALL(*media_session_, Suspend()).Times(0); 208 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
202 EXPECT_CALL(*media_session_, Resume()).Times(0); 209 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
203 media_blocker_->BlockMediaLoading(false); 210 media_blocker_->BlockMediaLoading(false);
204 } 211 }
205 212
206 TEST_F(CastMediaBlockerTest, Resume_When_Controllable) { 213 TEST_F(CastMediaBlockerTest, Resume_When_Controllable) {
207 // Tests CastMediaBlocker will only resume after unblock when controllable. 214 // Tests CastMediaBlocker will only resume after unblock when controllable.
208 EXPECT_CALL(*media_session_, Suspend()).Times(1); 215 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
209 EXPECT_CALL(*media_session_, Resume()).Times(0); 216 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
210 MediaSessionChanged(true, false); 217 MediaSessionChanged(true, false);
211 media_blocker_->BlockMediaLoading(true); 218 media_blocker_->BlockMediaLoading(true);
212 MediaSessionChanged(true, true); 219 MediaSessionChanged(true, true);
213 MediaSessionChanged(false, true); 220 MediaSessionChanged(false, true);
214 media_blocker_->BlockMediaLoading(false); 221 media_blocker_->BlockMediaLoading(false);
215 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 222 testing::Mock::VerifyAndClearExpectations(media_session_.get());
216 223
217 EXPECT_CALL(*media_session_, Suspend()).Times(0); 224 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
218 EXPECT_CALL(*media_session_, Resume()).Times(1); 225 EXPECT_CALL(*media_session_, Resume(_)).Times(1);
219 MediaSessionChanged(true, true); 226 MediaSessionChanged(true, true);
220 } 227 }
221 228
222 TEST_F(CastMediaBlockerTest, No_Resume) { 229 TEST_F(CastMediaBlockerTest, No_Resume) {
223 // Tests CastMediaBlocker will not resume if media starts playing by itself 230 // Tests CastMediaBlocker will not resume if media starts playing by itself
224 // after unblock. 231 // after unblock.
225 EXPECT_CALL(*media_session_, Suspend()).Times(1); 232 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
226 EXPECT_CALL(*media_session_, Resume()).Times(0); 233 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
227 MediaSessionChanged(true, false); 234 MediaSessionChanged(true, false);
228 media_blocker_->BlockMediaLoading(true); 235 media_blocker_->BlockMediaLoading(true);
229 MediaSessionChanged(true, true); 236 MediaSessionChanged(true, true);
230 MediaSessionChanged(false, true); 237 MediaSessionChanged(false, true);
231 media_blocker_->BlockMediaLoading(false); 238 media_blocker_->BlockMediaLoading(false);
232 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 239 testing::Mock::VerifyAndClearExpectations(media_session_.get());
233 240
234 EXPECT_CALL(*media_session_, Suspend()).Times(0); 241 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
235 EXPECT_CALL(*media_session_, Resume()).Times(0); 242 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
236 MediaSessionChanged(false, false); 243 MediaSessionChanged(false, false);
237 } 244 }
238 245
239 TEST_F(CastMediaBlockerTest, Block_Before_Resume) { 246 TEST_F(CastMediaBlockerTest, Block_Before_Resume) {
240 // Tests CastMediaBlocker does not resume if blocked again after an unblock. 247 // Tests CastMediaBlocker does not resume if blocked again after an unblock.
241 EXPECT_CALL(*media_session_, Suspend()).Times(1); 248 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
242 EXPECT_CALL(*media_session_, Resume()).Times(0); 249 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
243 MediaSessionChanged(true, false); 250 MediaSessionChanged(true, false);
244 media_blocker_->BlockMediaLoading(true); 251 media_blocker_->BlockMediaLoading(true);
245 MediaSessionChanged(true, true); 252 MediaSessionChanged(true, true);
246 MediaSessionChanged(false, true); 253 MediaSessionChanged(false, true);
247 media_blocker_->BlockMediaLoading(false); 254 media_blocker_->BlockMediaLoading(false);
248 testing::Mock::VerifyAndClearExpectations(media_session_.get()); 255 testing::Mock::VerifyAndClearExpectations(media_session_.get());
249 256
250 EXPECT_CALL(*media_session_, Suspend()).Times(0); 257 EXPECT_CALL(*media_session_, Suspend(_)).Times(0);
251 EXPECT_CALL(*media_session_, Resume()).Times(0); 258 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
252 media_blocker_->BlockMediaLoading(true); 259 media_blocker_->BlockMediaLoading(true);
253 MediaSessionChanged(true, true); 260 MediaSessionChanged(true, true);
254 } 261 }
255 262
256 TEST_F(CastMediaBlockerTest, Unblocked_Already_Playing) { 263 TEST_F(CastMediaBlockerTest, Unblocked_Already_Playing) {
257 // Tests CastMediaBlocker does not resume if unblocked and media is playing. 264 // Tests CastMediaBlocker does not resume if unblocked and media is playing.
258 EXPECT_CALL(*media_session_, Suspend()).Times(1); 265 EXPECT_CALL(*media_session_, Suspend(_)).Times(1);
259 EXPECT_CALL(*media_session_, Resume()).Times(0); 266 EXPECT_CALL(*media_session_, Resume(_)).Times(0);
260 MediaSessionChanged(true, false); 267 MediaSessionChanged(true, false);
261 media_blocker_->BlockMediaLoading(true); 268 media_blocker_->BlockMediaLoading(true);
262 media_blocker_->BlockMediaLoading(false); 269 media_blocker_->BlockMediaLoading(false);
263 } 270 }
264 271
265 } // namespace shell 272 } // namespace shell
266 } // namespace chromecast 273 } // namespace chromecast
OLDNEW
« chromecast/browser/cast_media_blocker.cc ('K') | « chromecast/browser/cast_media_blocker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698