chrome/browser/service_process/service_process_control_browsertest.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/service_process/service_process_control_browsertest.cc

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

Patch Set: Created 5 years, 5 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

« chrome/browser/safe_browsing/protocol_manager.cc ('K') | « chrome/browser/search_engines/ui_thread_search_terms_data.cc ('k') | chrome/browser/shell_integration.cc » ('j') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/service_process/service_process_control_browsertest.cc

diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc

index b4bd874e909f906e23fa07587614aca052cec6aa..1e1a46b147a0c7adbe6f49df11f8eadfb0ca952a 100644

--- a/chrome/browser/service_process/service_process_control_browsertest.cc

+++ b/chrome/browser/service_process/service_process_control_browsertest.cc

@@ -17,9 +17,9 @@

#include "base/thread_task_runner_handle.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/common/chrome_constants.h"

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

#include "chrome/common/service_process_util.h"

#include "chrome/test/base/in_process_browser_test.h"

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

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

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

#include "content/public/test/test_utils.h"

@@ -245,8 +245,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, ForceShutdown) {

base::ProcessId service_pid;

EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));

EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);

- chrome::VersionInfo version_info;

- ForceServiceProcessShutdown(version_info.Version(), service_pid);

+ ForceServiceProcessShutdown(version_info::GetVersionNumber(), service_pid);

}

IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) {