Add ARC app icons to the Task Manager UI

chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc

Index: chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc
diff --git a/chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc b/chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc
index cd55f95d27dc54dc2e06ca519fa6c5086836ec8b..929f37c9bfed9c59c40007f6928c1053c33445ce 100644
--- a/chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc
+++ b/chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc
@@ -68,10 +68,12 @@ class TabManagerDelegateTest : public ash::test::AshTestBase {
 };
 
 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",

[dcheng, 2016/06/01 23:55:01]

This should still use initializer list syntax. Ditto elsewhere.

[Yusuke Sato, 2016/06/02 00:19:26]

Done (and please let me know if I misunderstood your comment..)

[dcheng, 2016/06/02 00:37:47]

I'm not sure why this had to change at all in this patch: I think the old code
should have worked?

[Yusuke Sato, 2016/06/02 00:42:43]

Ah, I see. With the original code, the compiler tried to call the deleted copy
constructor and failed. Do you know a way to work around this?

In file included from
../../chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc:5:
In file included from
../../chrome/browser/memory/tab_manager_delegate_chromeos.h:8:
In file included from
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/memory:64:
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_construct.h:75:38:
error: call to deleted constructor of 'arc::ArcProcess'
    { ::new(static_cast<void*>(__p)) _T1(std::forward<_Args>(__args)...); }
                                     ^   ~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_uninitialized.h:75:8:
note: in instantiation of function template specialization
'std::_Construct<arc::ArcProcess, const arc::ArcProcess &>' requested here
                std::_Construct(std::__addressof(*__cur), *__first);
                     ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_uninitialized.h:117:2:
note: in instantiation of function template specialization
'std::__uninitialized_copy<false>::__uninit_copy<const arc::ArcProcess *,
arc::ArcProcess *>' requested here
        __uninit_copy(__first, __last, __result);
        ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_uninitialized.h:258:19:
note: in instantiation of function template specialization
'std::uninitialized_copy<const arc::ArcProcess *, arc::ArcProcess *>' requested
here
    { return std::uninitialized_copy(__first, __last, __result); }
                  ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_vector.h:1204:11:
note: in instantiation of function template specialization
'std::__uninitialized_copy_a<const arc::ArcProcess *, arc::ArcProcess *,
arc::ArcProcess>' requested here
            std::__uninitialized_copy_a(__first, __last,
                 ^
/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_vector.h:368:2:
note: in instantiation of function template specialization
'std::vector<arc::ArcProcess, std::allocator<arc::ArcProcess>
>::_M_range_initialize<const arc::ArcProcess *>' requested here
        _M_range_initialize(__l.begin(), __l.end(),
        ^
../../chrome/browser/memory/tab_manager_delegate_chromeos_unittest.cc:71:48:
note: in instantiation of member function 'std::vector<arc::ArcProcess,
std::allocator<arc::ArcProcess> >::vector' requested here
  std::vector<arc::ArcProcess> arc_processes = {
                                               ^
../../chrome/browser/chromeos/arc/arc_process.h:41:28: note: 'ArcProcess' has
been explicitly marked deleted here
  DISALLOW_COPY_AND_ASSIGN(ArcProcess);

[dcheng, 2016/06/02 01:00:56]

Oh I see. Initializer list doesn't work with move-only types.

OK, let's just revert this to your original code then:
  arc_processes.emplace_back(1, 10, "top", ...);
  arc_processes.emplace_back(2, 20, "foreground", ...);

etc

[Yusuke Sato, 2016/06/02 01:21:47]

Done.

+                             arc::mojom::ProcessState::SERVICE);
 
   TabStats tab1, tab2, tab3, tab4, tab5;
   tab1.tab_contents_id = 100;
@@ -101,8 +103,8 @@ TEST_F(TabManagerDelegateTest, CandidatesSorted) {
           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.
@@ -114,7 +116,7 @@ TEST_F(TabManagerDelegateTest, CandidatesSorted) {
   // 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();
@@ -122,20 +124,20 @@ TEST_F(TabManagerDelegateTest, CandidatesSorted) {
           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.
@@ -225,10 +227,12 @@ TEST_F(TabManagerDelegateTest, SetOomScoreAdj) {
   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;
@@ -283,10 +287,12 @@ TEST_F(TabManagerDelegateTest, KillMultipleProcesses) {
 
   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;