Reland 237634 and 237645.

chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.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 <queue>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h"
@@ skipping 125 matching lines @@
     replacements.SetPortStr(port);
     return embedded_test_server()->GetURL(path).ReplaceComponents(replacements);
   }
 
   FakeDesktopMediaPickerFactory picker_factory_;
 };
 
 }  // namespace
 
 // Flaky on Windows: http://crbug.com/301887
-#if defined(OS_WIN)
+// Failing on ChromeOS: http://crbug.com/324179
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
 #define MAYBE_ChooseDesktopMedia DISABLED_ChooseDesktopMedia
 #else
 #define MAYBE_ChooseDesktopMedia ChooseDesktopMedia
 #endif
 IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, MAYBE_ChooseDesktopMedia) {
   // Each of the following expectations corresponds to one test in
   // chrome/test/data/extensions/api_test/desktop_capture/test.js .
   FakeDesktopMediaPickerFactory::Expectation picker_expectations[] = {
     // pickerUiCanceled()
     { true, true,
@@ skipping 58 matching lines @@
       "getStream()", &result));
   EXPECT_TRUE(result);
 
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "getStreamWithInvalidId()", &result));
   EXPECT_TRUE(result);
 }
 
 }  // namespace extensions