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

Side by Side Diff: chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc

Issue 1973603002: arc: Make Play Store item persistance in shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + policy_browsertest.cc Created 4 years, 7 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 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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 15 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
16 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" 16 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
18 #include "chrome/browser/policy/profile_policy_connector.h" 18 #include "chrome/browser/policy/profile_policy_connector.h"
19 #include "chrome/browser/policy/profile_policy_connector_factory.h" 19 #include "chrome/browser/policy/profile_policy_connector_factory.h"
20 #include "chrome/browser/policy/test/local_policy_test_server.h" 20 #include "chrome/browser/policy/test/local_policy_test_server.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 22 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
24 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 24 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chrome/test/base/in_process_browser_test.h" 26 #include "chrome/test/base/in_process_browser_test.h"
27 #include "chrome/test/base/testing_profile.h" 27 #include "chrome/test/base/testing_profile.h"
28 #include "chromeos/chromeos_switches.h"
28 #include "chromeos/dbus/dbus_thread_manager.h" 29 #include "chromeos/dbus/dbus_thread_manager.h"
29 #include "chromeos/dbus/fake_session_manager_client.h" 30 #include "chromeos/dbus/fake_session_manager_client.h"
30 #include "chromeos/dbus/session_manager_client.h" 31 #include "chromeos/dbus/session_manager_client.h"
31 #include "components/arc/arc_bridge_service_impl.h" 32 #include "components/arc/arc_bridge_service_impl.h"
32 #include "components/arc/arc_service_manager.h" 33 #include "components/arc/arc_service_manager.h"
33 #include "components/arc/test/fake_arc_bridge_bootstrap.h" 34 #include "components/arc/test/fake_arc_bridge_bootstrap.h"
34 #include "components/arc/test/fake_arc_bridge_instance.h" 35 #include "components/arc/test/fake_arc_bridge_instance.h"
35 #include "components/policy/core/common/policy_switches.h" 36 #include "components/policy/core/common/policy_switches.h"
36 #include "components/prefs/pref_service.h" 37 #include "components/prefs/pref_service.h"
37 #include "components/signin/core/account_id/account_id.h" 38 #include "components/signin/core/account_id/account_id.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 ASSERT_TRUE(test_server_->Start()); 123 ASSERT_TRUE(test_server_->Start());
123 124
124 // Specify device management server URL. 125 // Specify device management server URL.
125 std::string url = test_server_->GetServiceURL().spec(); 126 std::string url = test_server_->GetServiceURL().spec();
126 base::CommandLine* const command_line = 127 base::CommandLine* const command_line =
127 base::CommandLine::ForCurrentProcess(); 128 base::CommandLine::ForCurrentProcess();
128 command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl, 129 command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl,
129 url); 130 url);
130 131
131 // Enable ARC. 132 // Enable ARC.
133 command_line->AppendSwitch(chromeos::switches::kEnableArc);
132 chromeos::FakeSessionManagerClient* const fake_session_manager_client = 134 chromeos::FakeSessionManagerClient* const fake_session_manager_client =
133 new chromeos::FakeSessionManagerClient; 135 new chromeos::FakeSessionManagerClient;
134 fake_session_manager_client->set_arc_available(true); 136 fake_session_manager_client->set_arc_available(true);
135 chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( 137 chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
136 std::unique_ptr<chromeos::SessionManagerClient>( 138 std::unique_ptr<chromeos::SessionManagerClient>(
137 fake_session_manager_client)); 139 fake_session_manager_client));
138 140
139 // Mock out ARC bridge. 141 // Mock out ARC bridge.
140 fake_arc_bridge_instance_.reset(new FakeArcBridgeInstance); 142 fake_arc_bridge_instance_.reset(new FakeArcBridgeInstance);
141 ArcServiceManager::SetArcBridgeServiceForTesting( 143 ArcServiceManager::SetArcBridgeServiceForTesting(
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 243
242 prefs->SetBoolean(prefs::kArcEnabled, true); 244 prefs->SetBoolean(prefs::kArcEnabled, true);
243 token_service()->IssueTokenForAllPendingRequests(kManagedAuthToken, 245 token_service()->IssueTokenForAllPendingRequests(kManagedAuthToken,
244 base::Time::Max()); 246 base::Time::Max());
245 ArcAuthServiceShutdownObserver observer; 247 ArcAuthServiceShutdownObserver observer;
246 observer.Wait(); 248 observer.Wait();
247 ASSERT_EQ(ArcAuthService::State::STOPPED, ArcAuthService::Get()->state()); 249 ASSERT_EQ(ArcAuthService::State::STOPPED, ArcAuthService::Get()->state());
248 } 250 }
249 251
250 } // namespace arc 252 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_auth_service.cc ('k') | chrome/browser/chromeos/arc/arc_auth_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698