chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc - Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger.

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/extensions/api/networking_private/networking_private_chromeos_apitest.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)

Patch Set: Removed unused #includes Created 4 years, 2 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/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc ('k') | chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc

diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc

index 740406b8872903a74df8c6b22f5f326c8a34fc71..6d22232e525d13549a9a90808878987ff067850d 100644

--- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc

+++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc

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

#include "chromeos/dbus/shill_manager_client.h"

#include "chromeos/dbus/shill_profile_client.h"

#include "chromeos/dbus/shill_service_client.h"

-#include "chromeos/login/user_names.h"

#include "chromeos/network/network_handler.h"

#include "chromeos/network/network_state_handler.h"

#include "chromeos/network/onc/onc_utils.h"

@@ -38,6 +37,7 @@

#include "components/policy/policy_constants.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_manager.h"

+#include "components/user_manager/user_names.h"

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

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

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

@@ -199,9 +199,8 @@ class NetworkingPrivateChromeOSApiTest : public ExtensionApiTest {

// uses the ProfileHelper to obtain the userhash crbug/238623.

const cryptohome::Identification login_user =

cryptohome::Identification::FromString(

- chromeos::login::CanonicalizeUserID(

- command_line->GetSwitchValueNative(

- chromeos::switches::kLoginUser)));

+ user_manager::CanonicalizeUserID(command_line->GetSwitchValueNative(

+ chromeos::switches::kLoginUser)));

const std::string sanitized_user =

CryptohomeClient::GetStubSanitizedUsername(login_user);

command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,