commit 956a89cdd994f834baadef5e465aa2552f3fe348
author Amin Hassani <ahassani@chromium.org> Wed Nov 04 19:59:16 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Tue Nov 10 20:08:26 2020 +0000
tree 6bbc856fed225e3760b0ade466ed31d42a9811c5
parent c288bf627fd2fc1d0466b70e4d6fbdb78414309d

update_engine: Remove inline identifier from RealSystemState

RealSystemState is a subclass. Overrided virtual functions by definition
cannot be inlined because they do get resolved at runtime if the base
class pointer is used (which is almost everywhere).

BUG=b:171829801
TEST=unittests

Change-Id: I5bdd62d6b3bcde04e859e0e819631fe1e6897fe2
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2521791
Tested-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Jae Hoon Kim <kimjae@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>

cros/real_system_state.h

diff --git a/cros/real_system_state.h b/cros/real_system_state.h
index a93a9b7..644ba78 100644
--- a/cros/real_system_state.h
+++ b/cros/real_system_state.h
@@ -60,64 +60,55 @@
   bool Initialize();
 
   // SystemState overrides.
-  inline void set_device_policy(
-      const policy::DevicePolicy* device_policy) override {
+  void set_device_policy(const policy::DevicePolicy* device_policy) override {
     device_policy_ = device_policy;
   }
 
-  inline const policy::DevicePolicy* device_policy() override {
+  const policy::DevicePolicy* device_policy() override {
     return device_policy_;
   }
 
-  inline BootControlInterface* boot_control() override {
-    return boot_control_.get();
-  }
+  BootControlInterface* boot_control() override { return boot_control_.get(); }
 
-  inline ClockInterface* clock() override { return &clock_; }
+  ClockInterface* clock() override { return &clock_; }
 
-  inline ConnectionManagerInterface* connection_manager() override {
+  ConnectionManagerInterface* connection_manager() override {
     return connection_manager_.get();
   }
 
-  inline HardwareInterface* hardware() override { return hardware_.get(); }
+  HardwareInterface* hardware() override { return hardware_.get(); }
 
-  inline MetricsReporterInterface* metrics_reporter() override {
+  MetricsReporterInterface* metrics_reporter() override {
     return &metrics_reporter_;
   }
 
-  inline PrefsInterface* prefs() override { return prefs_.get(); }
+  PrefsInterface* prefs() override { return prefs_.get(); }
 
-  inline PrefsInterface* powerwash_safe_prefs() override {
+  PrefsInterface* powerwash_safe_prefs() override {
     return powerwash_safe_prefs_.get();
   }
 
-  inline PayloadStateInterface* payload_state() override {
-    return &payload_state_;
-  }
+  PayloadStateInterface* payload_state() override { return &payload_state_; }
 
-  inline UpdateAttempter* update_attempter() override {
+  UpdateAttempter* update_attempter() override {
     return update_attempter_.get();
   }
 
-  inline OmahaRequestParams* request_params() override {
-    return &request_params_;
-  }
+  OmahaRequestParams* request_params() override { return &request_params_; }
 
-  inline P2PManager* p2p_manager() override { return p2p_manager_.get(); }
+  P2PManager* p2p_manager() override { return p2p_manager_.get(); }
 
-  inline chromeos_update_manager::UpdateManager* update_manager() override {
+  chromeos_update_manager::UpdateManager* update_manager() override {
     return update_manager_.get();
   }
 
-  inline PowerManagerInterface* power_manager() override {
+  PowerManagerInterface* power_manager() override {
     return power_manager_.get();
   }
 
-  inline bool system_rebooted() override { return system_rebooted_; }
+  bool system_rebooted() override { return system_rebooted_; }
 
-  inline DlcServiceInterface* dlcservice() override {
-    return dlcservice_.get();
-  }
+  DlcServiceInterface* dlcservice() override { return dlcservice_.get(); }
 
  private:
   // Real DBus proxies using the DBus connection.