commit f94cd970d4d308804921830ee6f88096eda5a828
author rhalavati@google.com <rhalavati@google.com> Thu Dec 07 06:09:40 2017
committer Commit Bot <commit-bot@chromium.org> Thu Dec 07 06:09:40 2017
tree 7579c5f9638ed634d21efb77ee32dadfbb78dce7
parent 0ddc2ee9f7218cc1631431c89f8b7555868f3df5

Refactoring remoting classes for sockets annotations.

We are adding network traffic annotations to sockets. Some remoting
classes are refactored to transfer the annotations to the underlying
sockets.

Bug: 656607
Change-Id: Id2deafff189259a808896cb9b426a91fc45c54bf
Reviewed-on: https://chromium-review.googlesource.com/810786
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522358}

remoting/protocol/client_video_dispatcher_unittest.cc

diff --git a/remoting/protocol/client_video_dispatcher_unittest.cc b/remoting/protocol/client_video_dispatcher_unittest.cc
index d4722f4..badb72b 100644
--- a/remoting/protocol/client_video_dispatcher_unittest.cc
+++ b/remoting/protocol/client_video_dispatcher_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "remoting/base/buffered_socket_writer.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
@@ -128,7 +129,8 @@
   packet.set_data(std::string());
 
   // Send a VideoPacket and verify that the client receives it.
-  writer_.Write(SerializeAndFrameMessage(packet), base::Closure());
+  writer_.Write(SerializeAndFrameMessage(packet), base::Closure(),
+                TRAFFIC_ANNOTATION_FOR_TESTS);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, video_packets_.size());
 
@@ -148,7 +150,8 @@
   packet.set_frame_id(kTestFrameId);
 
   // Send a VideoPacket and verify that the client receives it.
-  writer_.Write(SerializeAndFrameMessage(packet), base::Closure());
+  writer_.Write(SerializeAndFrameMessage(packet), base::Closure(),
+                TRAFFIC_ANNOTATION_FOR_TESTS);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, video_packets_.size());
 
@@ -184,7 +187,8 @@
       .WillOnce(testing::SaveArg<0>(&layout));
 
   // Send a VideoPacket and verify that the client receives it.
-  writer_.Write(SerializeAndFrameMessage(packet), base::Closure());
+  writer_.Write(SerializeAndFrameMessage(packet), base::Closure(),
+                TRAFFIC_ANNOTATION_FOR_TESTS);
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(1, layout.video_track_size());
@@ -205,11 +209,13 @@
   packet.set_frame_id(kTestFrameId);
 
   // Send two VideoPackets.
-  writer_.Write(SerializeAndFrameMessage(packet), base::Closure());
+  writer_.Write(SerializeAndFrameMessage(packet), base::Closure(),
+                TRAFFIC_ANNOTATION_FOR_TESTS);
   base::RunLoop().RunUntilIdle();
 
   packet.set_frame_id(kTestFrameId + 1);
-  writer_.Write(SerializeAndFrameMessage(packet), base::Closure());
+  writer_.Write(SerializeAndFrameMessage(packet), base::Closure(),
+                TRAFFIC_ANNOTATION_FOR_TESTS);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(2U, video_packets_.size());