Deflaky ScreenCapturerTest

webrtc/modules/desktop_capture/screen_drawer.cc

Index: webrtc/modules/desktop_capture/screen_drawer.cc
diff --git a/webrtc/modules/desktop_capture/screen_drawer_mac.cc b/webrtc/modules/desktop_capture/screen_drawer.cc
similarity index 52%
copy from webrtc/modules/desktop_capture/screen_drawer_mac.cc
copy to webrtc/modules/desktop_capture/screen_drawer.cc
index 1d0437b5a1022b26afaa5942d6abe76066fe455b..e463b0b66cdfe2282484b49a70eef1cc9fc831e3 100644
--- a/webrtc/modules/desktop_capture/screen_drawer_mac.cc
+++ b/webrtc/modules/desktop_capture/screen_drawer.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *  Copyright 2016 The WebRTC project authors. All Rights Reserved.

[Sergey Ulanov, 2016/10/18 03:26:56]

please keep (c) here.
(standard chromium header doesn't have (c), but it's not the same for WebRTC. I
think there is actually a presubmit check for this)

[Hzj_jie, 2016/10/19 00:46:47]

Unfortunately, presubmit check has not caught this.

  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -8,15 +8,23 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-// TODO(zijiehe): Implement ScreenDrawerMac
-
 #include "webrtc/modules/desktop_capture/screen_drawer.h"
 
 namespace webrtc {
 
-// static
-std::unique_ptr<ScreenDrawer> ScreenDrawer::Create() {
-  return nullptr;
+namespace {
+std::unique_ptr<ScreenDrawerLock> g_screen_drawer_lock;
+}  // namespace
+
+ScreenDrawerLock::ScreenDrawerLock() = default;
+ScreenDrawerLock::~ScreenDrawerLock() = default;
+
+ScreenDrawer::ScreenDrawer() {
+  g_screen_drawer_lock = ScreenDrawerLock::Create();
+}
+
+ScreenDrawer::~ScreenDrawer() {
+  g_screen_drawer_lock.reset();
 }
 
 }  // namespace webrtc