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

Unified Diff: components/arc/arc_bridge_service_impl.h

Issue 2425753002: Rename ArcBridgeBootstrap to ArcSession. (Closed)
Patch Set: Address comment. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_bridge_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/arc_bridge_service_impl.h
diff --git a/components/arc/arc_bridge_service_impl.h b/components/arc/arc_bridge_service_impl.h
index 1c3afaec5d9ac0124de157c13a0becb226d101cb..7f92c68c18ae6f14224856a0e378d423fab4f63d 100644
--- a/components/arc/arc_bridge_service_impl.h
+++ b/components/arc/arc_bridge_service_impl.h
@@ -12,8 +12,8 @@
#include "base/files/scoped_file.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "components/arc/arc_bridge_bootstrap.h"
#include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_session.h"
#include "mojo/public/cpp/bindings/binding.h"
namespace base {
@@ -25,12 +25,11 @@ namespace arc {
// Real IPC based ArcBridgeService that is used in production.
class ArcBridgeServiceImpl : public ArcBridgeService,
- public ArcBridgeBootstrap::Observer {
+ public ArcSession::Observer {
public:
- // This is the factory interface to inject ArcBridgeBootstrap instance
+ // This is the factory interface to inject ArcSession instance
// for testing purpose.
- using ArcBridgeBootstrapFactory =
- base::Callback<std::unique_ptr<ArcBridgeBootstrap>()>;
+ using ArcSessionFactory = base::Callback<std::unique_ptr<ArcSession>()>;
ArcBridgeServiceImpl();
~ArcBridgeServiceImpl() override;
@@ -39,13 +38,12 @@ class ArcBridgeServiceImpl : public ArcBridgeService,
void Shutdown() override;
- // Inject a factory to create ArcBridgeBootstrap instance for testing
- // purpose. |factory| must not be null.
- void SetArcBridgeBootstrapFactoryForTesting(
- const ArcBridgeBootstrapFactory& factory);
+ // Inject a factory to create ArcSession instance for testing purpose.
+ // |factory| must not be null.
+ void SetArcSessionFactoryForTesting(const ArcSessionFactory& factory);
- // Returns the current bootstrap instance for testing purpose.
- ArcBridgeBootstrap* GetBootstrapForTesting() { return bootstrap_.get(); }
+ // Returns the current ArcSession instance for testing purpose.
+ ArcSession* GetArcSessionForTesting() { return arc_session_.get(); }
// Normally, reconnecting after connection shutdown happens after a short
// delay. When testing, however, we'd like it to happen immediately to avoid
@@ -65,11 +63,11 @@ class ArcBridgeServiceImpl : public ArcBridgeService,
// Stops the running instance.
void StopInstance();
- // ArcBridgeBootstrap::Observer:
+ // ArcSession::Observer:
void OnReady() override;
void OnStopped(StopReason reason) override;
- std::unique_ptr<ArcBridgeBootstrap> bootstrap_;
+ std::unique_ptr<ArcSession> arc_session_;
// If the user's session has started.
bool session_started_;
@@ -81,8 +79,8 @@ class ArcBridgeServiceImpl : public ArcBridgeService,
// Delay the reconnection.
bool use_delay_before_reconnecting_ = true;
- // Factory to inject a fake ArcBridgeBootstrap instance for testing.
- ArcBridgeBootstrapFactory factory_;
+ // Factory to inject a fake ArcSession instance for testing.
+ ArcSessionFactory factory_;
// WeakPtrFactory to use callbacks.
base::WeakPtrFactory<ArcBridgeServiceImpl> weak_factory_;
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_bridge_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698