Add ARC app icons to the Task Manager UI

chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/memory/tab_manager_delegate_chromeos.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 50 matching lines @@
   aura::client::ActivationClient* GetActivationClient() {
     return aura::client::GetActivationClient(
         ash::Shell::GetPrimaryRootWindow());
   }
 
   aura::Window* arc_window_;
   std::string application_id_;
 };
 
 TEST_F(TabManagerDelegateTest, CandidatesSorted) {
-  std::vector<arc::ArcProcess> arc_processes = {
-      {1, 10, "top", arc::mojom::ProcessState::TOP},
-      {2, 20, "foreground", arc::mojom::ProcessState::FOREGROUND_SERVICE},
-      {3, 30, "service", arc::mojom::ProcessState::SERVICE}};
+  std::vector<arc::ArcProcess> arc_processes;
+  arc_processes.emplace_back(1, 10, "top", arc::mojom::ProcessState::TOP);
+  arc_processes.emplace_back(2, 20, "foreground",
+                             arc::mojom::ProcessState::FOREGROUND_SERVICE);
+  arc_processes.emplace_back(3, 30, "service",
+                             arc::mojom::ProcessState::SERVICE);
 
   TabStats tab1, tab2, tab3, tab4, tab5;
   tab1.tab_contents_id = 100;
   tab1.is_pinned = true;
 
   tab2.tab_contents_id = 200;
   tab2.is_internal_page = true;
 
   tab3.tab_contents_id = 300;
   tab3.is_pinned = true;
   tab3.is_media = true;
 
   tab4.tab_contents_id = 400;
   tab4.is_media = true;
 
   tab5.tab_contents_id = 500;
   tab5.is_app = true;
   TabStatsList tab_list = {
     tab1, tab2, tab3, tab4, tab5
   };
 
   std::vector<TabManagerDelegate::Candidate> candidates;
 
   // Case 1: ARC window in the foreground.
   ActivateArcWindow();
   candidates = TabManagerDelegate::GetSortedCandidates(
           tab_list, arc_processes);
   EXPECT_EQ(8U, candidates.size());
 
-  EXPECT_EQ("service", candidates[0].app->process_name);
-  EXPECT_EQ("foreground", candidates[1].app->process_name);
+  EXPECT_EQ("service", candidates[0].app->process_name());
+  EXPECT_EQ("foreground", candidates[1].app->process_name());
   // internal page.
   EXPECT_EQ(200, candidates[2].tab->tab_contents_id);
   // chrome app.
   EXPECT_EQ(500, candidates[3].tab->tab_contents_id);
   // pinned.
   EXPECT_EQ(100, candidates[4].tab->tab_contents_id);
   // media.
   EXPECT_EQ(400, candidates[5].tab->tab_contents_id);
   // pinned and media.
   EXPECT_EQ(300, candidates[6].tab->tab_contents_id);
   // ARC window is the active window, so top app has highest priority.
-  EXPECT_EQ("top", candidates[7].app->process_name);
+  EXPECT_EQ("top", candidates[7].app->process_name());
 
   // Case 2: ARC window in the background.
   DeactivateArcWindow();
   candidates = TabManagerDelegate::GetSortedCandidates(
           tab_list, arc_processes);
   EXPECT_EQ(8U, candidates.size());
 
-  EXPECT_EQ("service", candidates[0].app->process_name);
-  EXPECT_EQ("foreground", candidates[1].app->process_name);
+  EXPECT_EQ("service", candidates[0].app->process_name());
+  EXPECT_EQ("foreground", candidates[1].app->process_name());
   // internal page.
   EXPECT_EQ(200, candidates[2].tab->tab_contents_id);
 
   // Chrome app and android app are tied, so both orders are correct.
   if (candidates[3].is_arc_app) {
-    EXPECT_EQ("top", candidates[3].app->process_name);
+    EXPECT_EQ("top", candidates[3].app->process_name());
     // chrome app.
     EXPECT_EQ(500, candidates[4].tab->tab_contents_id);
   } else {
     // chrome app.
     EXPECT_EQ(500, candidates[3].tab->tab_contents_id);
-    EXPECT_EQ("top", candidates[4].app->process_name);
+    EXPECT_EQ("top", candidates[4].app->process_name());
   }
 
   // pinned.
   EXPECT_EQ(100, candidates[5].tab->tab_contents_id);
   // media.
   EXPECT_EQ(400, candidates[6].tab->tab_contents_id);
   // pinned and media.
   EXPECT_EQ(300, candidates[7].tab->tab_contents_id);
 }
 
@@ skipping 69 matching lines @@
  private:
   int target_memory_to_free_kb_;
   std::map<base::ProcessHandle, int> process_pss_;
 };
 
 TEST_F(TabManagerDelegateTest, SetOomScoreAdj) {
   arc::FakeArcBridgeService fake_arc_bridge_service;
   MockTabManagerDelegate tab_manager_delegate;
 
   ActivateArcWindow();
-  std::vector<arc::ArcProcess> arc_processes = {
-      {1, 10, "top", arc::mojom::ProcessState::TOP},
-      {2, 20, "foreground", arc::mojom::ProcessState::FOREGROUND_SERVICE},
-      {3, 30, "service", arc::mojom::ProcessState::SERVICE}};
+  std::vector<arc::ArcProcess> arc_processes;
+  arc_processes.emplace_back(1, 10, "top", arc::mojom::ProcessState::TOP);
+  arc_processes.emplace_back(2, 20, "foreground",
+                             arc::mojom::ProcessState::FOREGROUND_SERVICE);
+  arc_processes.emplace_back(3, 30, "service",
+                             arc::mojom::ProcessState::SERVICE);
 
   TabStats tab1, tab2, tab3, tab4, tab5;
   tab1.is_pinned = true;
   tab1.renderer_handle = 11;
 
   tab2.is_internal_page = true;
   tab2.renderer_handle = 11;
 
   tab3.is_pinned = true;
   tab3.is_media = true;
@@ skipping 34 matching lines @@
   arc::FakeArcBridgeService fake_arc_bridge_service;
 
   // Not owned.
   MockMemoryStat* memory_stat = new MockMemoryStat();
 
   // Instantiate the mock instance.
   MockTabManagerDelegate tab_manager_delegate(memory_stat);
 
   ActivateArcWindow();
 
-  std::vector<arc::ArcProcess> arc_processes = {
-      {10001, 100, "top", arc::mojom::ProcessState::TOP},
-      {10002, 200, "foreground", arc::mojom::ProcessState::FOREGROUND_SERVICE},
-      {10003, 300, "service", arc::mojom::ProcessState::SERVICE}};
+  std::vector<arc::ArcProcess> arc_processes;
+  arc_processes.emplace_back(10001, 100, "top", arc::mojom::ProcessState::TOP);
+  arc_processes.emplace_back(10002, 200, "foreground",
+                             arc::mojom::ProcessState::FOREGROUND_SERVICE);
+  arc_processes.emplace_back(10003, 300, "service",
+                             arc::mojom::ProcessState::SERVICE);
 
   TabStats tab1, tab2, tab3, tab4, tab5;
   tab1.is_pinned = true;
   tab1.renderer_handle = 11;
   tab1.tab_contents_id = 1;
 
   tab2.is_internal_page = true;
   tab2.renderer_handle = 11;
   tab2.tab_contents_id = 2;
 
@@ skipping 38 matching lines @@
   EXPECT_EQ(1U, killed_tabs.size());
 
   // nspid.
   EXPECT_EQ(10003, killed_arc_processes[0]);
   EXPECT_EQ(10002, killed_arc_processes[1]);
   // tab content id.
   EXPECT_EQ(2, killed_tabs[0]);
 }
 
 }  // namespace memory