Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1233)

Unified Diff: media/capture/video/linux/video_capture_device_factory_linux.cc

Issue 2668813002: Remove LazyInstance usage from media/ (Closed)
Patch Set: Fix presubmit comments. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/capture/video/linux/video_capture_device_factory_linux.cc
diff --git a/media/capture/video/linux/video_capture_device_factory_linux.cc b/media/capture/video/linux/video_capture_device_factory_linux.cc
index 8753a4acf7a522a386b8721e8ef0fe6ce6999cfc..45d8729bc091b4b021d40c843e6e6422d9af0058 100644
--- a/media/capture/video/linux/video_capture_device_factory_linux.cc
+++ b/media/capture/video/linux/video_capture_device_factory_linux.cc
@@ -22,7 +22,6 @@
#endif
#if defined(OS_CHROMEOS)
-#include "base/lazy_instance.h"
#include "media/capture/video/linux/camera_config_chromeos.h"
#include "media/capture/video/linux/video_capture_device_chromeos.h"
#endif
@@ -30,14 +29,6 @@
namespace media {
-namespace {
-
-#if defined(OS_CHROMEOS)
-base::LazyInstance<media::CameraConfigChromeOS>::Leaky g_camera_config =
- LAZY_INSTANCE_INITIALIZER;
-#endif
-}
-
// USB VID and PID are both 4 bytes long.
static const size_t kVidPidSize = 4;
@@ -216,11 +207,12 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceDescriptors(
HasUsableFormats(fd.get(), cap.capabilities)) {
const std::string model_id = GetDeviceModelId(unique_id);
#if defined(OS_CHROMEOS)
+ static CameraConfigChromeOS* config = new CameraConfigChromeOS();
device_descriptors->emplace_back(
reinterpret_cast<char*>(cap.card), unique_id, model_id,
VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE,
VideoCaptureTransportType::OTHER_TRANSPORT,
- g_camera_config.Get().GetCameraFacing(unique_id, model_id));
+ config->GetCameraFacing(unique_id, model_id));
#else
device_descriptors->emplace_back(
reinterpret_cast<char*>(cap.card), unique_id, model_id,
« no previous file with comments | « media/capture/video/linux/video_capture_device_chromeos.cc ('k') | media/cast/test/utility/udp_proxy_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698