Access ChromotingHost::clients_ only on network thread.

remoting/host/screen_recorder.cc

 // Copyright (c) 2011 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/screen_recorder.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 63 matching lines @@
 
   capture_timer_.Stop();
   is_recording_ = false;
 
   network_loop_->PostTask(FROM_HERE, base::Bind(
       &ScreenRecorder::DoStopOnNetworkThread, this, done_task));
 }
 
 void ScreenRecorder::AddConnection(
     scoped_refptr<ConnectionToClient> connection) {
+  DCHECK(network_loop_->BelongsToCurrentThread());
+  connections_.push_back(connection);
+
   capture_loop_->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &ScreenRecorder::DoInvalidateFullScreen));
-
-  // Add the client to the list so it can receive update stream.
-  network_loop_->PostTask(
-      FROM_HERE,
-      NewRunnableMethod(this, &ScreenRecorder::DoAddConnection, connection));
 }
 
 void ScreenRecorder::RemoveConnection(
     scoped_refptr<ConnectionToClient> connection) {
-  network_loop_->PostTask(
-      FROM_HERE,
-      NewRunnableMethod(this, &ScreenRecorder::DoRemoveClient, connection));
+  DCHECK(network_loop_->BelongsToCurrentThread());
+
+  ConnectionToClientList::iterator it =
+      std::find(connections_.begin(), connections_.end(), connection);
+  if (it != connections_.end()) {
+    connections_.erase(it);
+  }
 }
 
 void ScreenRecorder::RemoveAllConnections() {
-  network_loop_->PostTask(
-      FROM_HERE,
-      NewRunnableMethod(this, &ScreenRecorder::DoRemoveAllClients));
+  DCHECK(network_loop_->BelongsToCurrentThread());
+  connections_.clear();
 }
 
 void ScreenRecorder::UpdateSequenceNumber(int64 sequence_number) {
   // Sequence number is used and written only on the capture thread.
   if (MessageLoop::current() != capture_loop_) {
     capture_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &ScreenRecorder::UpdateSequenceNumber,
                           sequence_number));
     return;
@@ skipping 155 matching lines @@
   delete packet;
 
   if (network_stopped_)
     return;
 
   capture_loop_->PostTask(
       FROM_HERE, NewRunnableMethod(this,
                                    &ScreenRecorder::DoFinishOneRecording));
 }
 
-void ScreenRecorder::DoAddConnection(
-    scoped_refptr<ConnectionToClient> connection) {
-  DCHECK(network_loop_->BelongsToCurrentThread());
-
-  connections_.push_back(connection);
-}
-
-void ScreenRecorder::DoRemoveClient(
-    scoped_refptr<ConnectionToClient> connection) {
-  DCHECK(network_loop_->BelongsToCurrentThread());
-
-  ConnectionToClientList::iterator it =
-      std::find(connections_.begin(), connections_.end(), connection);
-  if (it != connections_.end()) {
-    connections_.erase(it);
-  }
-}
-
-void ScreenRecorder::DoRemoveAllClients() {
-  DCHECK(network_loop_->BelongsToCurrentThread());
-
-  // Clear the list of connections.
-  connections_.clear();
-}
-
 void ScreenRecorder::DoStopOnNetworkThread(const base::Closure& done_task) {
   DCHECK(network_loop_->BelongsToCurrentThread());
 
   // There could be tasks on the network thread when this method is being
   // executed. By setting the flag we'll not post anymore tasks from network
   // thread.
   //
   // After that a task is posted on encode thread to continue the stop
   // sequence.
   network_stopped_ = true;
@@ skipping 54 matching lines @@
     packet->set_encode_time_ms(encode_time_ms);
     scheduler_.RecordEncodeTime(encode_time);
   }
 
   network_loop_->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &ScreenRecorder::DoSendVideoPacket, packet));
 }
 
 }  // namespace remoting