| OLD | NEW |
| 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 "chrome/browser/ui/app_list/arc/arc_app_test.h" | 5 #include "chrome/browser/ui/app_list/arc/arc_app_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 DCHECK(!profile_); | 65 DCHECK(!profile_); |
| 66 profile_ = profile; | 66 profile_ = profile; |
| 67 const user_manager::User* user = CreateUserAndLogin(); | 67 const user_manager::User* user = CreateUserAndLogin(); |
| 68 | 68 |
| 69 // If for any reason the garbage collector kicks in while we are waiting for | 69 // If for any reason the garbage collector kicks in while we are waiting for |
| 70 // an icon, have the user-to-profile mapping ready to avoid using the real | 70 // an icon, have the user-to-profile mapping ready to avoid using the real |
| 71 // profile manager (which is null). | 71 // profile manager (which is null). |
| 72 chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, | 72 chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, |
| 73 profile_); | 73 profile_); |
| 74 | 74 |
| 75 // A valid |arc_app_list_prefs_| is needed for the Arc bridge service and the | 75 // A valid |arc_app_list_prefs_| is needed for the ARC bridge service and the |
| 76 // Arc auth service. | 76 // ARC auth service. |
| 77 arc_app_list_pref_ = ArcAppListPrefs::Get(profile_); | 77 arc_app_list_pref_ = ArcAppListPrefs::Get(profile_); |
| 78 if (!arc_app_list_pref_) { | 78 if (!arc_app_list_pref_) { |
| 79 ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting( | 79 ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting( |
| 80 profile_); | 80 profile_); |
| 81 } | 81 } |
| 82 arc_service_manager_ = base::MakeUnique<arc::ArcServiceManager>(nullptr); | 82 arc_service_manager_ = base::MakeUnique<arc::ArcServiceManager>(nullptr); |
| 83 arc_session_manager_ = base::MakeUnique<arc::ArcSessionManager>( | 83 arc_session_manager_ = base::MakeUnique<arc::ArcSessionManager>( |
| 84 base::MakeUnique<arc::ArcSessionRunner>( | 84 base::MakeUnique<arc::ArcSessionRunner>( |
| 85 base::Bind(arc::FakeArcSession::Create))); | 85 base::Bind(arc::FakeArcSession::Create))); |
| 86 DCHECK(arc::ArcSessionManager::Get()); | 86 DCHECK(arc::ArcSessionManager::Get()); |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 } | 210 } |
| 211 } | 211 } |
| 212 | 212 |
| 213 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) { | 213 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) { |
| 214 for (auto fake_package : fake_packages_) { | 214 for (auto fake_package : fake_packages_) { |
| 215 if (package.package_name == fake_package.package_name) | 215 if (package.package_name == fake_package.package_name) |
| 216 return true; | 216 return true; |
| 217 } | 217 } |
| 218 return false; | 218 return false; |
| 219 } | 219 } |
| OLD | NEW |