Attempt to fix issue 332427 by deleting LoggingImpl in CastEnvironment on the main thread instead o…

media/cast/cast_environment.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 "media/cast/cast_environment.h"
 
+#include "base/bind.h"
+#include "base/location.h"
 #include "base/logging.h"
 
 using base::TaskRunner;
 
+namespace {
+
+void DeleteLoggingOnMainThread(scoped_ptr<media::cast::LoggingImpl> logging) {
+  logging.reset();
+}
+
+}  // namespace
+
 namespace media {
 namespace cast {
 
 CastEnvironment::CastEnvironment(
     base::TickClock* clock,
     scoped_refptr<TaskRunner> main_thread_proxy,
     scoped_refptr<TaskRunner> audio_encode_thread_proxy,
     scoped_refptr<TaskRunner> audio_decode_thread_proxy,
     scoped_refptr<TaskRunner> video_encode_thread_proxy,
     scoped_refptr<TaskRunner> video_decode_thread_proxy,
     scoped_refptr<TaskRunner> transport_thread_proxy,
     const CastLoggingConfig& config)
     : clock_(clock),
       main_thread_proxy_(main_thread_proxy),
       audio_encode_thread_proxy_(audio_encode_thread_proxy),
       audio_decode_thread_proxy_(audio_decode_thread_proxy),
       video_encode_thread_proxy_(video_encode_thread_proxy),
       video_decode_thread_proxy_(video_decode_thread_proxy),
       transport_thread_proxy_(transport_thread_proxy),
       logging_(new LoggingImpl(main_thread_proxy, config)) {
   DCHECK(main_thread_proxy) << "Main thread required";
 }
 
-CastEnvironment::~CastEnvironment() {}
+CastEnvironment::~CastEnvironment() {
+  // Logging must be deleted on the main thread.
+  if (main_thread_proxy_->RunsTasksOnCurrentThread()) {
+    logging_.reset();
+  } else {
+    main_thread_proxy_->PostTask(
+        FROM_HERE,
+        base::Bind(&DeleteLoggingOnMainThread, base::Passed(&logging_)));
+  }
+}
 
 bool CastEnvironment::PostTask(ThreadId identifier,
                                const tracked_objects::Location& from_here,
                                const base::Closure& task) {
   scoped_refptr<TaskRunner> task_runner =
       GetMessageTaskRunnerForThread(identifier);
 
   return task_runner->PostTask(from_here, task);
 }
 
@@ skipping 53 matching lines @@
 }
 
 LoggingImpl* CastEnvironment::Logging() {
   DCHECK(CurrentlyOn(CastEnvironment::MAIN)) <<
       "Must be called from main thread";
   return logging_.get();
 }
 
 }  // namespace cast
 }  // namespace media