Make WebRtcLoggingHandlerHost tolerant of out-of-order messages.

chrome/browser/media/webrtc_logging_handler_host.cc

 // Copyright 2013 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/media/webrtc_logging_handler_host.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 201 matching lines @@
     IPC_MESSAGE_HANDLER(WebRtcLoggingMsg_LoggingStopped,
                         OnLoggingStoppedInRenderer)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
 void WebRtcLoggingHandlerHost::OnLoggingStoppedInRenderer() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (logging_state_ != STOPPING) {
+    // If an out-of-order response is received, stop_callback_ may be invalid,
+    // and must not be invoked.
+    BadMessageReceived();

[tommi (sloooow) - chröme, 2014/01/14 15:14:22]

perhaps log an error and the current value of logging_state_?

+    return;
+  }
   logging_state_ = STOPPED;
   FireGenericDoneCallback(&stop_callback_, true, "");
 }
 
 void WebRtcLoggingHandlerHost::StartLoggingIfAllowed() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!g_browser_process->webrtc_log_uploader()->ApplyForStartLogging()) {
     logging_state_ = CLOSED;
       FireGenericDoneCallback(
           &start_callback_, false, "Cannot start, maybe the maximum number of "
@@ skipping 144 matching lines @@
 void WebRtcLoggingHandlerHost::FireGenericDoneCallback(
     GenericDoneCallback* callback, bool success,
     const std::string& error_message) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!(*callback).is_null());
   content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
                                    base::Bind(*callback, success,
                                               error_message));
   (*callback).Reset();
 }