Disable aura window capture unit tests in unix

chrome/browser/media/native_desktop_media_list_unittest.cc

Index: chrome/browser/media/native_desktop_media_list_unittest.cc
diff --git a/chrome/browser/media/native_desktop_media_list_unittest.cc b/chrome/browser/media/native_desktop_media_list_unittest.cc
index 2b2c2c245069525b8be0c28916fc57288930b1d3..b469877c3dd13ff1fbd280633c2dbb943e35405d 100644
--- a/chrome/browser/media/native_desktop_media_list_unittest.cc
+++ b/chrome/browser/media/native_desktop_media_list_unittest.cc
@@ -34,7 +34,7 @@ using testing::DoAll;
 namespace {
 
 static const int kDefaultWindowCount = 2;
-#if defined(USE_AURA)
+#if defined(OS_WIN)

[Sergey Ulanov, 2016/04/20 20:58:14]

it should be clear from the code why Aura tests are enabled only Windows.

Suggest ENABLE_AURA_TESTS flag and use it below, i.e.:

#if defined(OS_WIN)
#define ENABLE_AURA_TESTS
#endif

Also add a comment with a reference to the tracking bug

[GeorgeZ, 2016/04/20 21:38:33]

Good point.

 static const int kDefaultAuraCount = 1;
 #else
 static const int kDefaultAuraCount = 0;
@@ -186,7 +186,7 @@ class NativeDesktopMediaListTest : public views::ViewsTestBase {
         std::unique_ptr<webrtc::WindowCapturer>(window_capturer_)));
 
     // Set update period to reduce the time it takes to run tests.
-    model_->SetUpdatePeriod(base::TimeDelta::FromMilliseconds(5));
+    model_->SetUpdatePeriod(base::TimeDelta::FromMilliseconds(20));

[Sergey Ulanov, 2016/04/20 20:58:14]

Why change this period?

[GeorgeZ, 2016/04/20 21:38:33]

Pleas see Comment 3 in
https://bugs.chromium.org/p/chromium/issues/detail?id=602494

In short, the message loop may not always quit after one refresh(). Add a little
delay will help message loop to have more chance to quit after one refresh() or
smaller number of refresh().

   }
 
   void AddNativeWindow(int id) {
@@ -388,7 +388,7 @@ TEST_F(NativeDesktopMediaListTest, AddNativeWindow) {
   EXPECT_EQ(model_->GetSource(index).id.id, index);
 }
 
-#if defined(USE_AURA)
+#if defined(OS_WIN)
 TEST_F(NativeDesktopMediaListTest, AddAuraWindow) {
   AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false);
 
@@ -408,7 +408,7 @@ TEST_F(NativeDesktopMediaListTest, AddAuraWindow) {
   EXPECT_EQ(model_->GetSource(index).id.aura_id,
             native_aura_id_map_[native_id]);
 }
-#endif  // defined(USE_AURA)
+#endif  // defined(OS_WIN)
 
 TEST_F(NativeDesktopMediaListTest, RemoveNativeWindow) {
   AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false);
@@ -423,7 +423,7 @@ TEST_F(NativeDesktopMediaListTest, RemoveNativeWindow) {
   message_loop()->Run();
 }
 
-#if defined(USE_AURA)
+#if defined(OS_WIN)
 TEST_F(NativeDesktopMediaListTest, RemoveAuraWindow) {
   AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false);
 
@@ -437,7 +437,7 @@ TEST_F(NativeDesktopMediaListTest, RemoveAuraWindow) {
 
   message_loop()->Run();
 }
-#endif  // defined(USE_AURA)
+#endif  // defined(OS_WIN)
 
 TEST_F(NativeDesktopMediaListTest, RemoveAllWindows) {
   AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false);