Pass camera facing info to audio client

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 76 matching lines @@
 #include "content/public/browser/tracing_controller.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "device/battery/battery_status_service.h"
 #include "device/gamepad/gamepad_service.h"
 #include "media/base/media.h"
 #include "media/base/user_input_monitor.h"
+#include "media/base/video_facing.h"
 #include "media/midi/midi_service.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "net/base/network_change_notifier.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/ssl/ssl_config_service.h"
 #include "ppapi/features/features.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "skia/ext/event_tracer_impl.h"
 #include "skia/ext/skia_memory_dump_provider.h"
@@ skipping 48 matching lines @@
 #include "base/memory/memory_pressure_monitor_win.h"
 #include "base/win/windows_version.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_win.h"
 #include "content/common/sandbox_win.h"
 #include "net/base/winsock_init.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "base/memory/memory_pressure_monitor_chromeos.h"
+#include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(USE_GLIB)
 #include <glib-object.h>
 #endif
 
 #if defined(OS_WIN)
 #include "media/device_monitors/system_message_window_win.h"
 #elif defined(OS_LINUX) && defined(USE_UDEV)
@@ skipping 975 matching lines @@
 #if defined(OS_ANDROID)
   // Let screen instance be overridable by parts.
   ui::SetScreenAndroid();
 #endif
 
   if (parts_) {
     TRACE_EVENT0("startup",
         "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun");
 
     parts_->PreMainMessageLoopRun();
+
+#if defined(OS_CHROMEOS)
+    if (chromeos::CrasAudioHandler::IsInitialized()) {
+      if (media_stream_manager_.get() != NULL) {
+        media_stream_manager_->SetVideoCaptureObserver(
+            std::unique_ptr<media::VideoCaptureObserver>(
+                new media::VideoCaptureObserverAdapter(

[chfremer, 2017/01/30 19:49:28]

We should use base::MakeUnique<> here.

[shenghao, 2017/02/08 02:07:10]

Done.

+                    static_cast<chromeos::VideoCaptureObserver*>(

[chfremer, 2017/01/30 19:49:28]

I don't think the compiler needs this cast, and I feel that even though it is
nice to verbosely indicate to readers that the instance is passed in as a
pointer to the interface, it may not be worth the extra line of code.

[shenghao, 2017/02/08 02:07:10]

Done.

+                        chromeos::CrasAudioHandler::Get()))));
+      } else {
+        DLOG(ERROR) << "media_stream_manager_ is null.";
+      }
+    } else {
+      DLOG(ERROR) << "CrasAudioHandler is not initialized.";
+    }
+#endif
   }
 
   // If the UI thread blocks, the whole UI is unresponsive.
   // Do not allow disk IO from the UI thread.
   base::ThreadRestrictions::SetIOAllowed(false);
   base::ThreadRestrictions::DisallowWaiting();
   return result_code_;
 }
 
 void BrowserMainLoop::RunMainMessageLoopParts() {
@@ skipping 29 matching lines @@
 #if defined(OS_ANDROID)
   g_browser_main_loop_shutting_down = true;
 #endif
 
   if (RenderProcessHost::run_renderer_in_process())
     RenderProcessHostImpl::ShutDownInProcessRenderer();
 
   if (parts_) {
     TRACE_EVENT0("shutdown",
                  "BrowserMainLoop::Subsystem:PostMainMessageLoopRun");
+    media_stream_manager_->SetVideoCaptureObserver(
+        std::unique_ptr<media::VideoCaptureObserver>());

[chfremer, 2017/01/30 19:49:28]

media_stream_manager_->SetVideoCaptureObserver(nullptr) should work and feels
more clear to me.

[shenghao, 2017/02/08 02:07:10]

Done.

     parts_->PostMainMessageLoopRun();
   }
 
   system_stats_monitor_.reset();
 
   // Destroying the GpuProcessHostUIShims on the UI thread posts a task to
   // delete related objects on the GPU thread. This must be done before
   // stopping the GPU thread. The GPU thread will close IPC channels to renderer
   // processes so this has to happen before stopping the IO thread.
   {
@@ skipping 567 matching lines @@
   if (!audio_manager_) {
     audio_thread_ = base::MakeUnique<AudioManagerThread>();
     audio_manager_ = media::AudioManager::Create(
         audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 }
 
 }  // namespace content