remove can_use_media_drm, this is no longer helpful

downstream change: https://gerrit-int.chromium.org/#/c/45443/

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232468 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 232468
Reland 232439: Add a way for notifications to be linked from settings dialog.

Adds an event, onShowSettings, that is fired when the link is clicked.
The link is only shown when the event is subscribed to.

TBR=miket@chromium.org,oshima@chromium.org,rsesek@chromium.org,mukai@chromium.org
BUG=304208, 286608

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232469 0039d316-1c4b-4281-b951-d872f2087c98
Fix memory_watcher compile failure (Windows, VS2010e, Release).

Changing memory_watcher to chromium_code produces a warning as error
when in Release mode. This change suppresses the warning.


BUG=314205
R=nick@chromium.org, scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232470 0039d316-1c4b-4281-b951-d872f2087c98
exclude failed test ExtensionIconManagerTest.LoadComponentExtensionResource
TBR=dgozman@chromium.org
BUG=314216

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232471 0039d316-1c4b-4281-b951-d872f2087c98
Adds 'exceptions' editing for content-protection attestation.

depends on crrev.com/31043008

BUG=310291
R=dkrahn@chromium.org, estade@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232472 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 232471
Build fix ui_unittests.

Currently build failed because of narrowing conversion of '1.0e+0' from 'double' to
'const int'.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232473 0039d316-1c4b-4281-b951-d872f2087c98
Fix crash of content_shell aura due to ime.

r230760 causes this bug. content_shell aura crashed in
InputMethodLinuxX11::Init() because LinuxInputMethodContextFactory::instance()
does not exist. Chrome aura creates ime context using GTK but content_shell aura
does not need to depend on GTK, so this CL uses FakeInputMethodContextFactory
for content_shell.

CrOS does not need this change because InputMethodLinuxX11 is not designed
for supporting CrOS.

BUG=133476

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232474 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 232474