chrome/browser/component_updater/widevine_cdm_component_installer.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 4 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 | « chrome/browser/component_updater/chrome_component_updater_configurator.cc ('k') | chrome/browser/devtools/devtools_targets_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 3552617e1bd3a06722b50ffecc5084ab424f857d..541fe18223480831245a0f0688ee2e8cb9bf899b 100644

--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc

+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc

@@ -24,10 +24,10 @@

#include "base/values.h"

#include "build/build_config.h"

#include "chrome/common/chrome_paths.h"

-#include "chrome/common/chrome_version_info.h"

#include "chrome/common/widevine_cdm_constants.h"

#include "components/component_updater/component_updater_service.h"

#include "components/component_updater/default_component_installer.h"

+#include "components/version_info/version_info.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/plugin_service.h"

#include "content/public/common/pepper_plugin_info.h"

@@ -330,7 +330,7 @@ void WidevineCdmComponentInstallerTraits::UpdateCdmAdapter(

GetPlatformDirectory(cdm_install_dir)

.AppendASCII(kWidevineCdmAdapterFileName);

- const std::string chrome_version = chrome::VersionInfo().Version();

+ const std::string chrome_version = version_info::GetVersionNumber();

DCHECK(!chrome_version.empty());

std::string adapter_version;

if (!base::ReadFileToString(adapter_version_path, &adapter_version) ||