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

Side by Side Diff: ash/common/session/session_controller_unittest.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « ash/common/session/session_controller.cc ('k') | ash/common/session/session_state_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/session/session_controller.h" 5 #include "ash/common/session/session_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/common/session/session_controller.h"
13 #include "ash/common/session/session_state_observer.h"
12 #include "ash/public/interfaces/session_controller.mojom.h" 14 #include "ash/public/interfaces/session_controller.mojom.h"
13 #include "ash/session/session_controller.h"
14 #include "ash/session/session_state_observer.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "components/user_manager/user_type.h" 17 #include "components/user_manager/user_type.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 namespace ash { 20 namespace ash {
21 namespace { 21 namespace {
22 22
23 class TestSessionStateObserver : public SessionStateObserver { 23 class TestSessionStateObserver : public SessionStateObserver {
24 public: 24 public:
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 EXPECT_EQ("user2@test.com", observer()->active_account_id().GetUserEmail()); 227 EXPECT_EQ("user2@test.com", observer()->active_account_id().GetUserEmail());
228 228
229 order = {1u, 2u}; 229 order = {1u, 2u};
230 controller()->SetUserSessionOrder(order); 230 controller()->SetUserSessionOrder(order);
231 EXPECT_EQ("user1@test.com,user2@test.com,", GetUserSessionEmails()); 231 EXPECT_EQ("user1@test.com,user2@test.com,", GetUserSessionEmails());
232 EXPECT_EQ("user1@test.com", observer()->active_account_id().GetUserEmail()); 232 EXPECT_EQ("user1@test.com", observer()->active_account_id().GetUserEmail());
233 } 233 }
234 234
235 } // namespace 235 } // namespace
236 } // namespace ash 236 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/session/session_controller.cc ('k') | ash/common/session/session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698