| 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 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ | 5 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ |
| 6 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ | 6 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 ArcAppListPrefs* arc_app_list_pref_ = nullptr; | 87 ArcAppListPrefs* arc_app_list_pref_ = nullptr; |
| 88 | 88 |
| 89 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_; | 89 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_; |
| 90 std::unique_ptr<arc::FakeAppInstance> app_instance_; | 90 std::unique_ptr<arc::FakeAppInstance> app_instance_; |
| 91 std::unique_ptr<arc::ArcAuthService> auth_service_; | 91 std::unique_ptr<arc::ArcAuthService> auth_service_; |
| 92 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; | 92 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; |
| 93 std::vector<arc::mojom::AppInfo> fake_apps_; | 93 std::vector<arc::mojom::AppInfo> fake_apps_; |
| 94 std::vector<arc::mojom::ArcPackageInfo> fake_packages_; | 94 std::vector<arc::mojom::ArcPackageInfo> fake_packages_; |
| 95 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_; | 95 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_; |
| 96 | 96 |
| 97 bool dbus_thread_manager_initialized_ = false; |
| 98 |
| 97 DISALLOW_COPY_AND_ASSIGN(ArcAppTest); | 99 DISALLOW_COPY_AND_ASSIGN(ArcAppTest); |
| 98 }; | 100 }; |
| 99 | 101 |
| 100 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ | 102 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ |
| OLD | NEW |