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

Side by Side Diff: media/blink/key_system_config_selector_unittest.cc

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « media/blink/key_system_config_selector.cc ('k') | media/blink/multibuffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/bind.h" 8 #include "base/bind.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 } 211 }
212 212
213 void OnSucceeded(const blink::WebMediaKeySystemConfiguration& result, 213 void OnSucceeded(const blink::WebMediaKeySystemConfiguration& result,
214 const CdmConfig& cdm_config) { 214 const CdmConfig& cdm_config) {
215 succeeded_count_++; 215 succeeded_count_++;
216 config_ = result; 216 config_ = result;
217 } 217 }
218 218
219 void OnNotSupported(const blink::WebString&) { not_supported_count_++; } 219 void OnNotSupported(const blink::WebString&) { not_supported_count_++; }
220 220
221 scoped_ptr<FakeKeySystems> key_systems_; 221 std::unique_ptr<FakeKeySystems> key_systems_;
222 scoped_ptr<FakeMediaPermission> media_permission_; 222 std::unique_ptr<FakeMediaPermission> media_permission_;
223 223
224 // Held values for the call to SelectConfig(). 224 // Held values for the call to SelectConfig().
225 blink::WebString key_system_ = blink::WebString::fromUTF8(kSupported); 225 blink::WebString key_system_ = blink::WebString::fromUTF8(kSupported);
226 std::vector<blink::WebMediaKeySystemConfiguration> configs_; 226 std::vector<blink::WebMediaKeySystemConfiguration> configs_;
227 blink::WebSecurityOrigin security_origin_ = 227 blink::WebSecurityOrigin security_origin_ =
228 blink::WebSecurityOrigin::createFromString(kDefaultSecurityOrigin); 228 blink::WebSecurityOrigin::createFromString(kDefaultSecurityOrigin);
229 229
230 // Holds the last successful accumulated configuration. 230 // Holds the last successful accumulated configuration.
231 blink::WebMediaKeySystemConfiguration config_; 231 blink::WebMediaKeySystemConfiguration config_;
232 232
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 759
760 blink::WebMediaKeySystemConfiguration config2; 760 blink::WebMediaKeySystemConfiguration config2;
761 config2.label = "b"; 761 config2.label = "b";
762 configs_.push_back(config2); 762 configs_.push_back(config2);
763 763
764 ASSERT_TRUE(SelectConfigRequestsPermissionAndReturnsConfig()); 764 ASSERT_TRUE(SelectConfigRequestsPermissionAndReturnsConfig());
765 ASSERT_EQ("b", config_.label); 765 ASSERT_EQ("b", config_.label);
766 } 766 }
767 767
768 } // namespace media 768 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/key_system_config_selector.cc ('k') | media/blink/multibuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698