Bring Audio Share and Tab Share Default On

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/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 143 matching lines @@
 
 }  // namespace
 
 // Flaky on Windows: http://crbug.com/301887
 #if defined(OS_WIN)
 #define MAYBE_ChooseDesktopMedia DISABLED_ChooseDesktopMedia
 #else
 #define MAYBE_ChooseDesktopMedia ChooseDesktopMedia
 #endif
 IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, MAYBE_ChooseDesktopMedia) {
-  // For tab and audio share, we need to turn on the flag, because the
-  // functionality is currently behind the flags.
+  // For tabshare, we need to turn on the flag.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       extensions::switches::kEnableTabForDesktopShare);
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      extensions::switches::kEnableDesktopCaptureAudio);
 
   // Each element in the following array corresponds to one test in
   // chrome/test/data/extensions/api_test/desktop_capture/test.js .
   TestFlags test_flags[] = {
       // pickerUiCanceled()
       {true, true, false, false, content::DesktopMediaID()},
       // chooseMedia()
       {true, true, false, false,
        content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
                                content::DesktopMediaID::kNullId)},
@@ skipping 95 matching lines @@
   EXPECT_TRUE(result);
   EXPECT_TRUE(test_flags[2].picker_created);
   EXPECT_FALSE(test_flags[2].picker_deleted);
 
   web_contents->Close();
   destroyed_watcher.Wait();
   EXPECT_TRUE(test_flags[2].picker_deleted);
 }
 
 }  // namespace extensions