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

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

Issue 1178423008: Provision to start base::SimpleTestTickClock at initial ticks Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 12 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 EXPECT_TRUE(widevine_uma_name.empty()); 118 EXPECT_TRUE(widevine_uma_name.empty());
119 #endif 119 #endif
120 120
121 EXPECT_TRUE(clearkey_uma_name.empty()) << "Clear Key is added by media/ and " 121 EXPECT_TRUE(clearkey_uma_name.empty()) << "Clear Key is added by media/ and "
122 "should not be added by the " 122 "should not be added by the "
123 "MediaClient."; 123 "MediaClient.";
124 ; 124 ;
125 } 125 }
126 126
127 TEST_F(RenderMediaClientTest, IsKeySystemsUpdateNeeded) { 127 TEST_F(RenderMediaClientTest, IsKeySystemsUpdateNeeded) {
128 base::SimpleTestTickClock* tick_clock = new base::SimpleTestTickClock(); 128 base::SimpleTestTickClock* tick_clock =
129 new base::SimpleTestTickClock(base::TimeTicks());
129 render_media_client_->SetTickClockForTesting( 130 render_media_client_->SetTickClockForTesting(
130 scoped_ptr<base::TickClock>(tick_clock)); 131 scoped_ptr<base::TickClock>(tick_clock));
131 132
132 // IsKeySystemsUpdateNeeded() always returns true after construction. 133 // IsKeySystemsUpdateNeeded() always returns true after construction.
133 EXPECT_TRUE(render_media_client_->IsKeySystemsUpdateNeeded()); 134 EXPECT_TRUE(render_media_client_->IsKeySystemsUpdateNeeded());
134 135
135 std::vector<media::KeySystemInfo> key_systems_info; 136 std::vector<media::KeySystemInfo> key_systems_info;
136 render_media_client_->AddSupportedKeySystems(&key_systems_info); 137 render_media_client_->AddSupportedKeySystems(&key_systems_info);
137 138
138 // No update needed immediately after AddSupportedKeySystems() call. 139 // No update needed immediately after AddSupportedKeySystems() call.
(...skipping 18 matching lines...) Expand all
157 158
158 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 159 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
159 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000)); 160 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
160 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 161 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
161 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000)); 162 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
162 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 163 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
163 #endif 164 #endif
164 } 165 }
165 166
166 } // namespace content 167 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698