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

Side by Side Diff: content/renderer/media/render_media_client_unittest.cc

Issue 2668813002: Remove LazyInstance usage from media/ (Closed)
Patch Set: Fix presubmit comments. Created 3 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/test/simple_test_tick_clock.h" 8 #include "base/test/simple_test_tick_clock.h"
9 #include "content/public/renderer/content_renderer_client.h" 9 #include "content/public/renderer/content_renderer_client.h"
10 #include "content/renderer/media/render_media_client.h" 10 #include "content/renderer/media/render_media_client.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 91 }
92 return false; 92 return false;
93 } 93 }
94 #endif 94 #endif
95 95
96 } // namespace 96 } // namespace
97 97
98 class RenderMediaClientTest : public testing::Test { 98 class RenderMediaClientTest : public testing::Test {
99 protected: 99 protected:
100 RenderMediaClientTest() 100 RenderMediaClientTest()
101 : render_media_client_(GetRenderMediaClientInstanceForTesting()) { 101 : render_media_client_(RenderMediaClient::GetInstance()) {
102 SetContentClient(&test_content_client_); 102 SetContentClient(&test_content_client_);
103 SetRendererClientForTesting(&test_content_renderer_client_); 103 SetRendererClientForTesting(&test_content_renderer_client_);
104 } 104 }
105 105
106 void EnableExtraKeySystem() { 106 void EnableExtraKeySystem() {
107 test_content_renderer_client_.EnableExtraKeySystem(); 107 test_content_renderer_client_.EnableExtraKeySystem();
108 } 108 }
109 109
110 RenderMediaClient* render_media_client_; 110 RenderMediaClient* render_media_client_;
111 111
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 176 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
177 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000)); 177 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
178 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 178 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
179 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000)); 179 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
180 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 180 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
181 #endif 181 #endif
182 } 182 }
183 183
184 } // namespace content 184 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/render_media_client.cc ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698