Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: chrome/browser/chromeos/login/crash_restore_browsertest.cc

Issue 2918203002: cros: Fix loading user profile w/o UserSessionManager (Closed)
Patch Set: rebase Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 11 matching lines...) Expand all
22 #include "components/user_manager/user.h" 22 #include "components/user_manager/user.h"
23 #include "components/user_manager/user_manager.h" 23 #include "components/user_manager/user_manager.h"
24 #include "content/public/test/test_utils.h" 24 #include "content/public/test/test_utils.h"
25 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
26 #include "third_party/cros_system_api/dbus/service_constants.h" 26 #include "third_party/cros_system_api/dbus/service_constants.h"
27 27
28 namespace chromeos { 28 namespace chromeos {
29 29
30 namespace { 30 namespace {
31 31
32 const char kUserId1[] = "user1@example.com"; 32 // Use consumer.example.com to keep policy code out of the tests.
33 const char kUserId2[] = "user2@example.com"; 33 constexpr char kUserId1[] = "user1@consumer.example.com";
34 const char kUserId3[] = "user3@example.com"; 34 constexpr char kUserId2[] = "user2@consumer.example.com";
35 constexpr char kUserId3[] = "user3@consumer.example.com";
35 36
36 } // namespace 37 } // namespace
37 38
38 class CrashRestoreSimpleTest : public InProcessBrowserTest { 39 class CrashRestoreSimpleTest : public InProcessBrowserTest {
39 protected: 40 protected:
40 CrashRestoreSimpleTest() {} 41 CrashRestoreSimpleTest() {}
41 42
42 ~CrashRestoreSimpleTest() override {} 43 ~CrashRestoreSimpleTest() override {}
43 44
44 void SetUpCommandLine(base::CommandLine* command_line) override { 45 void SetUpCommandLine(base::CommandLine* command_line) override {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 auto* session_manager = session_manager::SessionManager::Get(); 175 auto* session_manager = session_manager::SessionManager::Get();
175 EXPECT_EQ(session_manager::SessionState::ACTIVE, 176 EXPECT_EQ(session_manager::SessionState::ACTIVE,
176 session_manager->session_state()); 177 session_manager->session_state());
177 EXPECT_EQ(3u, session_manager->sessions().size()); 178 EXPECT_EQ(3u, session_manager->sessions().size());
178 EXPECT_EQ(session_manager->sessions()[0].user_account_id, account_id1_); 179 EXPECT_EQ(session_manager->sessions()[0].user_account_id, account_id1_);
179 EXPECT_EQ(session_manager->sessions()[1].user_account_id, account_id2_); 180 EXPECT_EQ(session_manager->sessions()[1].user_account_id, account_id2_);
180 EXPECT_EQ(session_manager->sessions()[2].user_account_id, account_id3_); 181 EXPECT_EQ(session_manager->sessions()[2].user_account_id, account_id3_);
181 } 182 }
182 183
183 } // namespace chromeos 184 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698