Merge 225485 - drive: Skip applying root entry in feeds.

We expected the "My Drive" (or drive/root) entry is NOT included in the
feeds from the server. However, in some occasion (maybe a server side bug),
it is included. To be defensive we should filter our such an entry here.

BUG=297259
TBR=kinaba@chromoium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226125 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225989 "Clear |drm_bridges_| in BrowserMediaPlayerManager:..."

> Clear |drm_bridges_| in BrowserMediaPlayerManager::DestroyAllMediaPlayers().
> 
> BUG=299853
> TEST=No browser crash after previous renderer crash.
> R=qinmin@chromium.org
> 
> Review URL: https://codereview.chromium.org/25146002

TBR=xhwang@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226241 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225064 "Fix crash when showing error in wrench menu"

> Fix crash when showing error in wrench menu
> 
> This is speculative fix for a crash in
> WrenchMenuModel::AddGlobalErrorMenuItems(). My guess is that we're
> modifying a list while iterating over it. Fix is to move the modifying
> call out of the loop.
> 
> BUG=278543
> TEST=Can't repro the crash. Just built and ran Chrome.
> NOTRY=true
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=224987
> 
> Review URL: https://chromiumcodereview.appspot.com/23435011

TBR=sail@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226244 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225904 "Request new data after receiving an aborted access..."

> Request new data after receiving an aborted access unit
> 
> Currently when decoder job has no data, it will call requestData().
> When requestData() returns the new data, we immediately started decoding it by calling DecodeNextAccessUnit().
> However, if the status of the access unit is kAborted, we treat it as an EOS.
> This is wrong. Instead, we should ignore this access unit and pause the MediaSourcePlayer.
> 
> BUG=300078
> 
> Review URL: https://codereview.chromium.org/25142002

TBR=qinmin@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226249 0039d316-1c4b-4281-b951-d872f2087c98
Merge 226048 "Make the local discovery UI update itself based on..."

> Make the local discovery UI update itself based on whether the user is logged in
> 
> Update chrome://devices/ as the user's login state changes, refresh the printer
> list, and add/remove login promos.
> 
> BUG=299963
> 
> Review URL: https://codereview.chromium.org/24996006

TBR=noamsml@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226252 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225201 "Remove missing .js file from unit test."

> Remove missing .js file from unit test.
> 
> This was causing remoting_unittests to fail in Release builds.
> 
> BUG=297970
> TBR=rmsousa@chromium.org
> 
> Review URL: https://codereview.chromium.org/24620002

TBR=jamiewalch@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226263 0039d316-1c4b-4281-b951-d872f2087c98
Incrementing VERSION to 31.0.1650.9

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226353 0039d316-1c4b-4281-b951-d872f2087c98
Merge 226051 "Fix a threading bug in the brlapi basec braille co..."

> Fix a threading bug in the brlapi basec braille controller
> 
> BUG=178559
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=225008
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=225398
> 
> Review URL: https://codereview.chromium.org/24325002

TBR=plundblad@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226363 0039d316-1c4b-4281-b951-d872f2087c98
Merge 226123 "Use production Wallet service URL by default."

> Use production Wallet service URL by default.
> 
> Also change --wallet-service-use-prod to --wallet-service-use-sandbox instead
> (and update about:flags description).
> 
> BUG=299902
> R=estade@chromium.org
> TEST=unit_tests, no developer warning/real generated cards by default
> 
> Review URL: https://codereview.chromium.org/25127002

TBR=dbeam@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226396 0039d316-1c4b-4281-b951-d872f2087c98
Merge 226109 "Allows Kiosk mode app to store display preferences."

> Allows Kiosk mode app to store display preferences.
> 
> Some kiosk app provides the UI to edit the display preferences and
> the edit result should be stored.
> 
> R=oshima@chromium.org
> 
> Review URL: https://codereview.chromium.org/24923002

TBR=mukai@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226397 0039d316-1c4b-4281-b951-d872f2087c98
Merge 226207 "Translate: Disable offer-to-translate checkboxes w..."

> Translate: Disable offer-to-translate checkboxes when Translate is disabled
> 
> When the user disables Translate feature, "Offer to translate..." checkboxes should be disabled and unchecked because the checking state doesn't make sense in this case.
> 
> BUG=298321
> 
> Review URL: https://codereview.chromium.org/24983004

TBR=hajimehoshi@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226432 0039d316-1c4b-4281-b951-d872f2087c98
Merge 226203 "Removed the experimental flag for Chromecast suppo..."

> Removed the experimental flag for Chromecast support and the corresponding strings.
> 
> BUG=299971
> 
> NOTRY=true
> 
> Review URL: https://codereview.chromium.org/25266002

TBR=maybelle@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226458 0039d316-1c4b-4281-b951-d872f2087c98
Merge 218097 "Merge 191028 "[Sync] Disable unrecoverable error u..."

> Merge 191028 "[Sync] Disable unrecoverable error uploading."
> 
> > [Sync] Disable unrecoverable error uploading.
> > 
> > Disabling for 30 branch.
> > 
> > BUG=235583
> > TBR=rlarocque@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/12770030
> 
> TBR=zea@chromium.org
> 
> Review URL: https://codereview.chromium.org/22867019

TBR=zea@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226463 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225345 "NSS: don't advertise TLS 1.2-only ciphersuites in ..."

> NSS: don't advertise TLS 1.2-only ciphersuites in a TLS 1.1 ClientHello.
> 
> Chrome is advertising SHA256 ciphersuites with a TLS 1.1 ClientHello. This
> breaks PolarSSL servers because they also have a bug: they accept the SHA256
> ciphersuite and then break because they negotiated TLS 1.1
> 
> This change causes NSS not to advertise cipher suites that aren't applicable to
> the version being negotiated.
> 
> BUG=297151
> 
> Review URL: https://codereview.chromium.org/23928007

TBR=agl@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226464 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225614 "Add experimental AGC to default audio constraints."

> Add experimental AGC to default audio constraints.
> 
> TESTED=Experimental AGC was enabled in apprtc.
> 
> Review URL: https://codereview.chromium.org/24516002

TBR=ajm@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226465 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225810 "Ensure that pending PNaCl translations are cleaned..."

> Ensure that pending PNaCl translations are cleaned up on plugin destruction
> 
> The PnaclCoordinator in the plugin sends a TranslationFinished message to the
> PnaclHost in the browser when translations are aborted for various errors it can
> detect, but on surfaway (or when the embed tag is removed) the plugin simply
> gets destroyed.  This CL adds an explicit state to indicate that the translation
> has finished and been reported to the browser, and if the coordinator is prematurely
> destroyed, it sends TranslationFinished so the browser can clean up.
> 
> This is tested by hooking the progress events and removing and re-adding the
> embed.
> 
> R=jvoung@chromium.org, ncbray@chromium.org
> BUG=297644
> TEST= browser_tests --gtest_filter=NaClBrowserTestPnacl.PnaclErrorHandling
> 
> Review URL: https://codereview.chromium.org/23522072

TBR=dschuff@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226472 0039d316-1c4b-4281-b951-d872f2087c98
Merge 226217 "Show menu after selection change"

> Show menu after selection change
> 
> Delay showing the context menu shown from the context menu button. This
> is so that the selection changes before the menu is shown and the update
> of the menu items is done in the correct order.
> 
> BUG=301584
> R=dbeam@chromium.org
> 
> Review URL: https://codereview.chromium.org/25174005

TBR=arv@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226475 0039d316-1c4b-4281-b951-d872f2087c98
Revert 226249 "Merge 225904 "Request new data after receiving an..."

> Merge 225904 "Request new data after receiving an aborted access..."
> 
> > Request new data after receiving an aborted access unit
> > 
> > Currently when decoder job has no data, it will call requestData().
> > When requestData() returns the new data, we immediately started decoding it by calling DecodeNextAccessUnit().
> > However, if the status of the access unit is kAborted, we treat it as an EOS.
> > This is wrong. Instead, we should ignore this access unit and pause the MediaSourcePlayer.
> > 
> > BUG=300078
> > 
> > Review URL: https://codereview.chromium.org/25142002
> 
> TBR=qinmin@chromium.org
> 
> Review URL: https://codereview.chromium.org/25537003

TBR=qinmin@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226478 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225354 "Limit image decoded size on low end Android devices"

> Limit image decoded size on low end Android devices
> 
> Limit decoded size to 3M pixels on low end Android devices.
> The image decoder may downsample the images to meet the limit.
> 
> BUG=276666
> 
> Review URL: https://codereview.chromium.org/23600067

TBR=wangxianzhu@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226479 0039d316-1c4b-4281-b951-d872f2087c98
Merge 225904 "Request new data after receiving an aborted access..."

> Request new data after receiving an aborted access unit
> 
> Currently when decoder job has no data, it will call requestData().
> When requestData() returns the new data, we immediately started decoding it by calling DecodeNextAccessUnit().
> However, if the status of the access unit is kAborted, we treat it as an EOS.
> This is wrong. Instead, we should ignore this access unit and pause the MediaSourcePlayer.
> 
> BUG=300078
> 
> Review URL: https://codereview.chromium.org/25142002

TBR=qinmin@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226480 0039d316-1c4b-4281-b951-d872f2087c98