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

Unified Diff: chrome/browser/ui/app_list/arc/arc_app_test.h

Issue 2557513004: Remove explicit singletonness of ArcBridgeService part 3. (Closed)
Patch Set: Address comments. Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/arc/arc_app_test.h
diff --git a/chrome/browser/ui/app_list/arc/arc_app_test.h b/chrome/browser/ui/app_list/arc/arc_app_test.h
index a5453a3dba2179e78379e0542dddb7161d7fc1e1..077510bd8c3626bcef645b7b1763e738636f175e 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.h
@@ -17,8 +17,8 @@ namespace mojom {
class AppInfo;
class ArcPackageInfo;
}
+class ArcServiceManager;
class ArcSessionManager;
-class FakeArcBridgeService;
class FakeAppInstance;
}
@@ -73,8 +73,6 @@ class ArcAppTest {
chromeos::FakeChromeUserManager* GetUserManager();
- arc::FakeArcBridgeService* bridge_service() { return bridge_service_.get(); }
-
arc::FakeAppInstance* app_instance() { return app_instance_.get(); }
ArcAppListPrefs* arc_app_list_prefs() { return arc_app_list_pref_; }
@@ -82,6 +80,9 @@ class ArcAppTest {
arc::ArcSessionManager* arc_session_manager() {
return arc_session_manager_.get();
}
+ arc::ArcServiceManager* arc_service_manager() {
+ return arc_service_manager_.get();
+ }
private:
const user_manager::User* CreateUserAndLogin();
@@ -93,9 +94,10 @@ class ArcAppTest {
ArcAppListPrefs* arc_app_list_pref_ = nullptr;
- std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;
- std::unique_ptr<arc::FakeAppInstance> app_instance_;
+ std::unique_ptr<arc::ArcServiceManager> arc_service_manager_;
std::unique_ptr<arc::ArcSessionManager> arc_session_manager_;
+ std::unique_ptr<arc::FakeAppInstance> app_instance_;
+
std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
std::vector<arc::mojom::AppInfo> fake_apps_;
std::vector<arc::mojom::AppInfo> fake_default_apps_;
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698