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

Side by Side Diff: content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 "ppapi/features/features.h" 5 #include "ppapi/features/features.h"
6 6
7 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 7 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
8 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h" 8 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
9 9
10 #include <utility> 10 #include <utility>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 // Only Pepper plugins are supported, so it must ultimately be a ppapi object. 57 // Only Pepper plugins are supported, so it must ultimately be a ppapi object.
58 PepperWebPluginImpl* ppapi_plugin = static_cast<PepperWebPluginImpl*>(plugin); 58 PepperWebPluginImpl* ppapi_plugin = static_cast<PepperWebPluginImpl*>(plugin);
59 scoped_refptr<PepperPluginInstanceImpl> plugin_instance = 59 scoped_refptr<PepperPluginInstanceImpl> plugin_instance =
60 ppapi_plugin->instance(); 60 ppapi_plugin->instance();
61 if (!plugin_instance.get()) 61 if (!plugin_instance.get())
62 return std::unique_ptr<PepperCdmWrapper>(); 62 return std::unique_ptr<PepperCdmWrapper>();
63 63
64 GURL plugin_url(plugin_instance->container()->document().url()); 64 GURL plugin_url(plugin_instance->container()->document().url());
65 GURL plugin_security_origin = plugin_url.GetOrigin(); 65 GURL plugin_security_origin = plugin_url.GetOrigin();
66 CHECK_EQ(security_origin, plugin_security_origin) 66 // Pepper instance has a different origin than the EME call.
67 << "Pepper instance has a different origin than the EME call."; 67 CHECK_EQ(security_origin, plugin_security_origin);
68 68
69 if (!plugin_instance->GetContentDecryptorDelegate()) 69 if (!plugin_instance->GetContentDecryptorDelegate())
70 return std::unique_ptr<PepperCdmWrapper>(); 70 return std::unique_ptr<PepperCdmWrapper>();
71 71
72 return std::unique_ptr<PepperCdmWrapper>( 72 return std::unique_ptr<PepperCdmWrapper>(
73 new PepperCdmWrapperImpl(std::move(helper_plugin), plugin_instance)); 73 new PepperCdmWrapperImpl(std::move(helper_plugin), plugin_instance));
74 } 74 }
75 75
76 PepperCdmWrapperImpl::PepperCdmWrapperImpl( 76 PepperCdmWrapperImpl::PepperCdmWrapperImpl(
77 ScopedHelperPlugin helper_plugin, 77 ScopedHelperPlugin helper_plugin,
(...skipping 12 matching lines...) Expand all
90 helper_plugin_.reset(); 90 helper_plugin_.reset();
91 } 91 }
92 92
93 ContentDecryptorDelegate* PepperCdmWrapperImpl::GetCdmDelegate() { 93 ContentDecryptorDelegate* PepperCdmWrapperImpl::GetCdmDelegate() {
94 return plugin_instance_->GetContentDecryptorDelegate(); 94 return plugin_instance_->GetContentDecryptorDelegate();
95 } 95 }
96 96
97 } // namespace content 97 } // namespace content
98 98
99 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 99 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698