arc: Revamp the ArcBridgeService interface

chrome/browser/memory/tab_manager_delegate_chromeos.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 CHROME_BROWSER_MEMORY_TAB_MANAGER_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_MEMORY_TAB_MANAGER_DELEGATE_CHROMEOS_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 57 matching lines @@
   ANDROID_PERSISTENT = 1 << 30,
   ANDROID_NON_EXISTS = 0x7FFFFFFF
 };
 
 // The Chrome OS TabManagerDelegate is responsible for keeping the
 // renderers' scores up to date in /proc/<pid>/oom_score_adj.
 //
 // Note that AdjustOomPriorities will be called on the UI thread by
 // TabManager, but the actual work will take place on the file thread
 // (see implementation of AdjustOomPriorities).
-class TabManagerDelegate : public arc::ArcBridgeService::Observer,
+class TabManagerDelegate : public arc::ArcBridgeService::InstanceObserver<
+                               arc::mojom::ProcessInstance>,
                            public aura::client::ActivationChangeObserver,
                            public content::NotificationObserver,
                            public chrome::BrowserListObserver {
  public:
   class MemoryStat;
 
   explicit TabManagerDelegate(const base::WeakPtr<TabManager>& tab_manager);
 
   TabManagerDelegate(const base::WeakPtr<TabManager>& tab_manager,
                      TabManagerDelegate::MemoryStat* mem_stat);
 
   ~TabManagerDelegate() override;
 
   void OnBrowserSetLastActive(Browser* browser) override;
 
-  // ArcBridgeService::Observer overrides.
-  void OnProcessInstanceReady() override;
-  void OnProcessInstanceClosed() override;
+  // ArcBridgeService::InstanceObserver<arc::mojom::ProcessInstance> overrides.
+  void OnInstanceReady(arc::mojom::ProcessInstance* process_instance,
+                       uint32_t version) override;
+  void OnInstanceClosed(arc::mojom::ProcessInstance*) override;
 
   // aura::ActivationChangeObserver overrides.
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
       aura::Window* lost_active) override;
 
   // Kills a process on memory pressure.
   void LowMemoryKill(const TabStatsList& tab_stats);
 
@@ skipping 22 matching lines @@
 
  private:
   FRIEND_TEST_ALL_PREFIXES(TabManagerDelegateTest, CandidatesSorted);
   FRIEND_TEST_ALL_PREFIXES(TabManagerDelegateTest, KillMultipleProcesses);
   FRIEND_TEST_ALL_PREFIXES(TabManagerDelegateTest, SetOomScoreAdj);
 
   struct Candidate;
   class FocusedProcess;
   class UmaReporter;
 
-  friend std::ostream& operator<<(
-      std::ostream& out, const Candidate& candidate);
+  friend std::ostream& operator<<(std::ostream& out,
+                                  const Candidate& candidate);
 
   // content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Pair to hold child process host id and ProcessHandle.
   typedef std::pair<int, base::ProcessHandle> ProcessInfo;
 
   // Cache OOM scores in memory.
-  typedef base::hash_map<base::ProcessHandle, int> ProcessScoreMap;
+  typedef base::hash_map<base::ProcessHandle, int> ProcessScoreMap;  // NOLINT

[hidehiko, 2016/07/11 05:24:53]

Clarification: For what ... ? > NOLINT.

[Luis Héctor Chávez, 2016/07/11 17:13:33]

`git cl lint` flags this as std::hash_map. I'll try to fix that in another
change.

[Luis Héctor Chávez, 2016/07/11 20:10:44]

Filed crbug.com/627202. I have a fix ready and will apply it as soon as I can
figure out how to send it for review and have this rolled.

 
   // Get the list of candidates to kill, sorted by reversed importance.
   static std::vector<Candidate> GetSortedCandidates(
       const TabStatsList& tab_list,
       const std::vector<arc::ArcProcess>& arc_processes);
 
   // Posts AdjustFocusedTabScore task to the file thread.
   void OnFocusTabScoreAdjustmentTimeout();
 
   // Kills a process after getting all info of tabs and apps.
@@ skipping 74 matching lines @@
 // On ARC enabled machines, either a tab or an app could be a possible
 // victim of low memory kill process. This is a helper struct which holds a
 // pointer to an app or a tab (but not both) to facilitate prioritizing the
 // victims.
 struct TabManagerDelegate::Candidate {
   Candidate(const TabStats* _tab, int _priority)
       : tab(_tab), priority(_priority), is_arc_app(false) {}
   Candidate(const arc::ArcProcess* _app, int _priority)
       : app(_app), priority(_priority), is_arc_app(true) {}
 
-  bool operator<(const Candidate& rhs) const {
-    return priority < rhs.priority;
-  }
+  bool operator<(const Candidate& rhs) const { return priority < rhs.priority; }
 
   union {
     const TabStats* tab;
     const arc::ArcProcess* app;
   };
   int priority;
   bool is_arc_app;
 };
 
 // A thin wrapper over library process_metric.h to get memory status so unit
@@ skipping 15 matching lines @@
   // reported if available memory is under the number.
   static int LowMemoryMarginKB();
 
   // Reads in an integer.
   static int ReadIntFromFile(const char* file_name, int default_val);
 };
 
 }  // namespace memory
 
 #endif  // CHROME_BROWSER_MEMORY_TAB_MANAGER_DELEGATE_CHROMEOS_H_