Fix the links in the media bubble pointing to the media UI.

chrome/browser/ui/browser_content_setting_bubble_model_delegate.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/browser_content_setting_bubble_model_delegate.h"
 
 #include "chrome/browser/content_settings/chrome_content_settings_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ skipping 27 matching lines @@
       // blocking, so bounce to an explanatory page for now.
       content_settings::RecordMixedScriptAction(
           content_settings::MIXED_SCRIPT_ACTION_CLICKED_LEARN_MORE);
       chrome::AddSelectedTabWithURL(browser_,
                                     GURL(kInsecureScriptHelpUrl),
                                     ui::PAGE_TRANSITION_LINK);
       return;
     case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
       chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
       return;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
+      // If the user requested to see the settings page for both camera
+      // and microphone, point them to the default settings instead

[msw, 2015/07/30 17:15:26]

nit: "instead of"?

[msramek, 2015/07/31 12:34:52]

Done.

+      // exceptions, as camera and microphone exceptions are now in two
+      // different overlays. Specifically, point them to the microphone
+      // default settings, as those appear first in the list.
+      chrome::ShowDefaultContentSettings(
+          browser_, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
     default:
       chrome::ShowContentSettings(browser_, type);
       return;
   }
 }
 
 void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage(
     ContentSettingsType type) {
   if (type != CONTENT_SETTINGS_TYPE_PLUGINS)
     return;
   chrome::AddSelectedTabWithURL(browser_,
                                 GURL(chrome::kBlockedPluginLearnMoreURL),
                                 ui::PAGE_TRANSITION_LINK);
 }