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

Unified Diff: chrome/browser/component_updater/widevine_cdm_component_installer.cc

Issue 180953006: Remove default values for custom CDM component manifest properties. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/component_updater/widevine_cdm_component_installer.cc
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index bbfdd0f7abaef783c61ace582ad97c7c55841bdf..f42e57d2147f43dd20e208ab42017b6f2e7778b4 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -148,16 +148,8 @@ bool CheckForCompatibleVersion(const base::DictionaryValue& manifest,
VersionCheckFunc version_check_func) {
std::string versions_string;
if (!manifest.GetString(version_name, &versions_string)) {
- DLOG(WARNING)
- << "Widevine CDM component manifest is missing " << version_name;
- // TODO(ddorwin): Remove this once all users have been updated.
- // The original manifests did not include this string, so add its version.
- if (version_name == kCdmModuleVersionsName)
- versions_string = "4";
- else if (version_name == kCdmInterfaceVersionsName)
- versions_string = "1";
- else if (version_name == kCdmHostVersionsName)
- versions_string = "1";
+ DLOG(WARNING) << "Widevine CDM component manifest missing " << version_name;
+ return false;
ddorwin 2014/03/05 22:44:03 Note: A missing string is a failure, but an empty
xhwang 2014/03/06 01:28:42 If the string is empty, it should return false at
ddorwin 2014/03/06 02:03:53 Yes.
}
DLOG_IF(WARNING, versions_string.empty())
<< "Widevine CDM component manifest has empty " << version_name;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698