[Chromoting] Deprecate AggregatedProcessResourceUsage.*

remoting/host/process_stats_sender_unittest.cc

 // Copyright 2017 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 "remoting/host/process_stats_sender.h"
 
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
@@ skipping 58 matching lines @@
     usage.set_working_set_size(index_);
     usage.set_pagefile_size(index_);
     index_++;
     return usage;
   }
 
   // Checks the expected usage based on index.
   static void AssertExpected(
       const protocol::AggregatedProcessResourceUsage& usage,
       size_t index) {
-    ASSERT_EQ(usage.processor_usage(), index);
-    ASSERT_EQ(usage.working_set_size(), index);
-    ASSERT_EQ(usage.pagefile_size(), index);
+    ASSERT_EQ(usage.usages_size(), 1);
+    ASSERT_EQ(usage.usages().Get(0).processor_usage(), index);

[joedow, 2017/06/30 15:13:43]

Do you want to ASSERT on processor_name as well?

[Hzj_jie, 2017/06/30 22:39:29]

Done.

+    ASSERT_EQ(usage.usages().Get(0).working_set_size(), index);
+    ASSERT_EQ(usage.usages().Get(0).pagefile_size(), index);
   }
 
   static void AssertExpected(const protocol::ProcessResourceUsage& usage,
                              size_t index) {
     ASSERT_EQ(usage.processor_usage(), index);
     ASSERT_EQ(usage.working_set_size(), index);
     ASSERT_EQ(usage.pagefile_size(), index);
   }
 
   size_t issued_times() const { return index_; }
@@ skipping 70 matching lines @@
             stats->reset(new ProcessStatsSender(
                 stub, base::TimeDelta::FromMilliseconds(1),
                 { agent1, agent2 } ));
           },
           base::Unretained(&stats), base::Unretained(&stub),
           base::Unretained(&agent1), base::Unretained(&agent2)));
   run_loop.Run();
 
   ASSERT_EQ(stub.received().size(), 10U);
   for (size_t i = 0; i < stub.received().size(); i++) {
-    FakeProcessStatsAgent::AssertExpected(stub.received()[i], i * 2);
+    ASSERT_EQ(stub.received()[i].usages_size(), 2);
     for (int j = 0; j < stub.received()[i].usages_size(); j++) {
       FakeProcessStatsAgent::AssertExpected(
           stub.received()[i].usages().Get(j), i);
     }
   }
 }
 
 }  // namespace remoting