chrome/browser/password_manager/chrome_password_manager_client_unittest.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/password_manager/chrome_password_manager_client_unittest.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/password_manager/chrome_password_manager_client.cc ('k') | chrome/browser/password_manager/password_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/password_manager/chrome_password_manager_client_unittest.cc

diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc

index 06c93da7cf6115b0023ad9499aa3c67b976e6e02..04f82835b790b4040417afa2e39df62353811cdd 100644

--- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc

+++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc

@@ -12,7 +12,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/sync/profile_sync_service_mock.h"

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

+#include "chrome/common/channel_info.h"

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

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

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

@@ -24,6 +24,7 @@

#include "components/password_manager/core/common/credential_manager_types.h"

#include "components/password_manager/core/common/password_manager_pref_names.h"

#include "components/password_manager/core/common/password_manager_switches.h"

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

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

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

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

@@ -219,7 +220,7 @@ TEST_F(ChromePasswordManagerClientTest,

IsAutomaticPasswordSavingEnabledWhenFlagIsSetTest) {

base::CommandLine::ForCurrentProcess()->AppendSwitch(

password_manager::switches::kEnableAutomaticPasswordSaving);

- if (chrome::VersionInfo::GetChannel() == version_info::Channel::UNKNOWN)

+ if (chrome::GetChannel() == version_info::Channel::UNKNOWN)

EXPECT_TRUE(GetClient()->IsAutomaticPasswordSavingEnabled());

else

EXPECT_FALSE(GetClient()->IsAutomaticPasswordSavingEnabled());