arc-bridge: Expose the Mojo version number of the interfaces

components/arc/arc_bridge_service.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 132 matching lines @@
   // thread that this class was created on.
   AppInstance* app_instance() { return app_ptr_.get(); }
   InputInstance* input_instance() { return input_ptr_.get(); }
   NotificationsInstance* notifications_instance() {
     return notifications_ptr_.get();
   }
   PowerInstance* power_instance() { return power_ptr_.get(); }
   ProcessInstance* process_instance() { return process_ptr_.get(); }
   SettingsInstance* settings_instance() { return settings_ptr_.get(); }
 
+  int32_t app_version() const { return app_ptr_.version(); }
+  int32_t input_version() const { return input_ptr_.version(); }
+  int32_t notifications_version() const { return notifications_ptr_.version(); }
+  int32_t power_version() const { return power_ptr_.version(); }
+  int32_t process_version() const { return process_ptr_.version(); }
+  int32_t settings_version() const { return settings_ptr_.version(); }
+
   // ArcHost:
   void OnAppInstanceReady(AppInstancePtr app_ptr) override;
   void OnInputInstanceReady(InputInstancePtr input_ptr) override;
   void OnNotificationsInstanceReady(
       NotificationsInstancePtr notifications_ptr) override;
   void OnPowerInstanceReady(PowerInstancePtr power_ptr) override;
   void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override;
   void OnSettingsInstanceReady(SettingsInstancePtr process_ptr) override;
 
   // Gets the current state of the bridge service.
@@ skipping 14 matching lines @@
   base::ObserverList<Observer>& observer_list() { return observer_list_; }
 
   bool CalledOnValidThread();
 
  private:
   friend class ArcBridgeTest;
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Prerequisites);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup);
 
+  // Callbacks for QueryVersion.
+  void OnAppVersionReady(int32_t version);
+  void OnInputVersionReady(int32_t version);
+  void OnNotificationsVersionReady(int32_t version);
+  void OnPowerVersionReady(int32_t version);
+  void OnProcessVersionReady(int32_t version);
+  void OnSettingsVersionReady(int32_t version);
+
   // Mojo interfaces.
   AppInstancePtr app_ptr_;
   InputInstancePtr input_ptr_;
   NotificationsInstancePtr notifications_ptr_;
   PowerInstancePtr power_ptr_;
   ProcessInstancePtr process_ptr_;
   SettingsInstancePtr settings_ptr_;
 
+  // Temporary Mojo interfaces.  After a Mojo interface pointer has been
+  // received from the other endpoint, we still need to asynchronously query
+  // its version.  While that is going on, we should still return nullptr on
+  // the xxx_instance() functions.
+  // To keep the xxx_instance() functions being trivial, store the instance
+  // pointer in a temporary variable to avoid losing its reference.
+  AppInstancePtr temporary_app_ptr_;

[hidehiko, 2015/12/29 13:49:20]

Instead of making temporary_XXX_ptr_ fields, you can pass the ptr to the bound
methods' arguments, I believe.

[Luis Héctor Chávez, 2015/12/29 16:51:09]

That won't work. It would need something like

app_ptr.QueryVersion(base::Bind(...,
                                base::Passed(&app_ptr)));

By the time QueryVersion() is executed, |app_ptr| points to invalid data (or
rather, an empty InterfacePtr<...>), so it crashes on a DCHECK.

Alternatively, passing the InterfacePtr as a pointer, which seems even worse.

[hidehiko, 2016/01/05 08:05:52]

Ah, you're right. QueryVersion is a member of InterfacePtr... Sorry for wrong
suggestion.

+  InputInstancePtr temporary_input_ptr_;
+  NotificationsInstancePtr temporary_notifications_ptr_;
+  PowerInstancePtr temporary_power_ptr_;
+  ProcessInstancePtr temporary_process_ptr_;
+  SettingsInstancePtr temporary_settings_ptr_;
+
   base::ObserverList<Observer> observer_list_;
 
   base::ThreadChecker thread_checker_;
 
   // If the ARC instance service is available.
   bool available_;
 
   // The current state of the bridge.
   ArcBridgeService::State state_;
 
+  // WeakPtrFactory to use callbacks.
+  base::WeakPtrFactory<ArcBridgeService> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_