Merge: "mac: Fix a focus ring visual bug in the media content settings bubble." to 2490.

> The parent view of the button was too small, and the button lay outside the
> bounds of its parent view. Increasing the size of its parent view fixed the
> problem.
>
> BUG=525544
>
> Review URL: https://codereview.chromium.org/1312163006
>
> Cr-Commit-Position: refs/heads/master@{#347549}
BUG=525544
[email protected], [email protected]

Review URL: https://codereview.chromium.org/1328673004 .

Cr-Commit-Position: refs/branch-heads/2490@{#192}
Cr-Branched-From: 7790a35-refs/heads/master@{#344925}

Author: erikchen

chrome/app/nibs/ContentBlockedMedia.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F1077" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F1112" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
         <development version="5100" identifier="xcode"/>
@@ -76,7 +76,7 @@
                         </subviews>
                     </customView>
                     <customView id="29" customClass="GTMWidthBasedTweaker">
-                        <rect key="frame" x="193" y="0.0" width="123" height="37"/>
+                        <rect key="frame" x="193" y="0.0" width="123" height="41"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" id="17">
@@ -96,7 +96,7 @@ DQ
                         </subviews>
                     </customView>
                     <customView id="28" customClass="GTMWidthBasedTweaker">
-                        <rect key="frame" x="0.0" y="0.0" width="194" height="37"/>
+                        <rect key="frame" x="0.0" y="0.0" width="194" height="41"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" id="15">