[Merge M49] [TabManager] Protect tabs that are using camera/microphone.

chrome/browser/ui/webui/about_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/about_ui.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 504 matching lines @@
   memory::TabStatsList stats = tab_manager->GetTabStats();
   std::vector<std::string> titles;
   titles.reserve(stats.size());
   for (memory::TabStatsList::iterator it = stats.begin(); it != stats.end();
        ++it) {
     std::string str;
     str.reserve(4096);
     str += "<b>";
     str += it->is_app ? "[App] " : "";
     str += it->is_internal_page ? "[Internal] " : "";
-    str += it->is_playing_audio ? "[Audio] " : "";
+    str += it->is_media ? "[Media] " : "";
     str += it->is_pinned ? "[Pinned] " : "";
     str += it->is_discarded ? "[Discarded] " : "";
     str += "</b>";
     str += net::EscapeForHTML(base::UTF16ToUTF8(it->title));
 #if defined(OS_CHROMEOS)
     str += base::StringPrintf(" (%d) ", it->oom_score);
 #endif
     if (!it->is_discarded) {
       str += base::StringPrintf(" <a href='%s%s/%" PRId64 "'>Discard</a>",
                                 chrome::kChromeUIDiscardsURL,
@@ skipping 500 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui);
 
 #if defined(ENABLE_THEMES)
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));
 }