chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 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/download/notification/download_notification_browsertest.cc ('k') | chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc

diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc

index de9428ff7908542c55e0b3eb35daa5660852f087..963f0fddaa3f4186bdfc8ca187e31f34837e8067 100644

--- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc

+++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc

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

#include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"

#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"

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

-#include "components/signin/core/account_id/account_id.h"

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

#include "extensions/common/switches.h"

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

@@ -56,10 +55,9 @@

user_manager_enabler_.reset(

new chromeos::ScopedUserManagerEnabler(fake_user_manager_));

- const AccountId kiosk_account_id(

- AccountId::FromUserEmail("kiosk@foobar.com"));

- fake_user_manager_->AddKioskAppUser(kiosk_account_id);

- fake_user_manager_->LoginUser(kiosk_account_id);

+ const std::string kKiosLogin = "kiosk@foobar.com";

+ fake_user_manager_->AddKioskAppUser(kKiosLogin);

+ fake_user_manager_->LoginUser(kKiosLogin);

}

void SetAutoLaunchApp() {