chrome/browser/extensions/api/networking_private/networking_private_apitest.cc - Issue 398753004: [cros] Move User class to user_manager component.

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_apitest.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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

« no previous file with comments | « chrome/browser/extensions/api/autotest_private/autotest_private_api.cc ('k') | chrome/browser/extensions/extension_assets_manager_chromeos.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_apitest.cc

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

index bc255291ea8018e5945f7d75eb2fa4514ed37d65..93f181c2b65b87444907c5281b1beccc6ecb06dc 100644

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

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

@@ -7,10 +7,10 @@

#include "base/command_line.h"

#include "base/macros.h"

#include "chrome/browser/browser_process.h"

-#include "chrome/browser/chromeos/login/users/user.h"

#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/extensions/extension_apitest.h"

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

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

#include "extensions/common/switches.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -189,7 +189,7 @@ class ExtensionNetworkingPrivateApiTest

void InitializeSanitizedUsername() {

chromeos::UserManager* user_manager = chromeos::UserManager::Get();

- chromeos::User* user = user_manager->GetActiveUser();

+ user_manager::User* user = user_manager->GetActiveUser();

CHECK(user);

std::string userhash;

DBusThreadManager::Get()->GetCryptohomeClient()->GetSanitizedUsername(