summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disables VideoBearTheora as crashes.sky@chromium.org2010-09-091-1/+2
| | | | | | | | BUG=54939 TEST=none Review URL: http://codereview.chromium.org/3333023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58968 0039d316-1c4b-4281-b951-d872f2087c98
* The RenderViewHostManagerTest.PageDoesBackAndReload unit-test was keeping a ↵jcivelli@chromium.org2010-09-091-10/+11
| | | | | | | | | | | | | pointer to a RVH after a navigation was committed and was comparing the current RVH some time after that with that old RVH that had been deleted at that point. When we were lucky, the same address was used for the new RVH and the test would pass. When we were not lucky the test would fail. BUG=54708 TEST=Run the unit-tests. Review URL: http://codereview.chromium.org/3335011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58967 0039d316-1c4b-4281-b951-d872f2087c98
* Disable some pyauto tests failing on the official win buildernirnimesh@chromium.org2010-09-091-2/+5
| | | | | | | | | | | | | Disabling some downloads tests which fail on the official builder only when run via buildbot, while I debug this. BUG=54942 TEST= Review URL: http://codereview.chromium.org/3301017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58966 0039d316-1c4b-4281-b951-d872f2087c98
* Re-add a data file for translate tests.nirnimesh@chromium.org2010-09-091-0/+22
| | | | | | | | | | | Spanish google page data file is used by some tests. Add it back. BUG= TEST= Review URL: http://codereview.chromium.org/3351018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58965 0039d316-1c4b-4281-b951-d872f2087c98
* Move devtools and sidebar handling to BWC and ensure the order of layout ↵alekseys@chromium.org2010-09-0921-467/+704
| | | | | | | | | | | | | | | | | | | | | | | | | | adjustments during tab change updates to eliminate UI flickering. TabContents.xib changes: devtools and sidebar NSSplitViews removed (moved to BrowserWindow.xib), contentsContainer_ view removed (now it's inserted at runtime). BrowserWindow.xib chnages: devtools and sidebar NSSplitViews added into FastResizeView. BUG=22717, 31633 TEST=Run unit_tests, browser_tests and interactive_ui_tests. Open google.com in one tab (it's easy to spot content relayout on google.com), trigger an infobar and content scroll bar on another tab (ru.wikipedia.org with translation infobar will do), switch tabs back and forth. Content should not relayout, scroll bar should not "jump". Open new tab and make sure bookmark bar is not always visible, open any site which triggers infobar and big enough to show content scroll bar on another tab, switch tabs back and forth. Content should not relayout, scroolbar should not "jump". Repeat the tests above with sidebar opened on any of these tabs, page and sidebar content should not relayout, sidebar should stay the same width, scrollbar should not "jump". Repeat the tests above with devtools docked. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58964 0039d316-1c4b-4281-b951-d872f2087c98
* We now expect PPAPITest.URLLoader to pass.darin@chromium.org2010-09-091-2/+1
| | | | | | | | | R=brettw BUG=51345 Review URL: http://codereview.chromium.org/3296015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58963 0039d316-1c4b-4281-b951-d872f2087c98
* Deletes "Go incognito" button after login screen.altimofeev@chromium.org2010-09-094-0/+15
| | | | | | | | | BUG=chromium-os:5630 TEST=Sing in as new user, notice that no "Go Incognito" button appears in the "set your profile" screen. Review URL: http://codereview.chromium.org/3320007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58962 0039d316-1c4b-4281-b951-d872f2087c98
* Add a couple of new tests to verify that gcf: protocol amit@chromium.org2010-09-091-28/+48
| | | | | | | | | | | can not be used to navigate to http and https URLs. BUG=none TEST=NavigationTest.GcfProtocol2, NavigationTest.GcfProtocol3 Review URL: http://codereview.chromium.org/3307019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58959 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the flaky mark from several Geolocation tests. We no longer see the ↵phajdan.jr@chromium.org2010-09-091-13/+6
| | | | | | | | | | | | | flakes. TBR=bulach, joth BUG=52518 TEST=browser_tests Review URL: http://codereview.chromium.org/3359015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58958 0039d316-1c4b-4281-b951-d872f2087c98
* Add options page for Chat Manager.zhurunz@google.com2010-09-092-0/+6
| | | | | | Review URL: http://codereview.chromium.org/3363010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58957 0039d316-1c4b-4281-b951-d872f2087c98
* Implement gallery install APIrafaelw@chromium.org2010-09-0917-69/+305
| | | | | | | | | | This patch implements chrome.experimental.management.install() which is only available for use by the web store. Calling with an extensionId, causes the download url to be constructed internally and downloaded and then cause the installation to bypass the normal permissions dialog. BUG=27431,54148 Review URL: http://codereview.chromium.org/3353015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58956 0039d316-1c4b-4281-b951-d872f2087c98
* Step 3 integrating the HistoryQuickProvider: Implement searching and ↵mrossetti@chromium.org2010-09-095-28/+476
| | | | | | | | | | | production of search results in the InMemoryURLIndex. Unit test the production of results. Minor change in URLHistoryProvuder unit test setup. BUG=None TEST=None (unit tests added) Review URL: http://codereview.chromium.org/3364004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58955 0039d316-1c4b-4281-b951-d872f2087c98
* NTP: Fix the size of the most visited settings button so that the image is ↵arv@chromium.org2010-09-091-2/+2
| | | | | | | | | | | not cut off. BUG=54864 TEST=Open NTP and look at the wrench icon of the most visited section. Review URL: http://codereview.chromium.org/3362014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58954 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Time::FromDoubleT so that it will return null time when 0 is passed.jianli@chromium.org2010-09-094-3/+24
| | | | | | | | | | | | This is the rework of this issue before previous submit is reverted. We need to fix the usage of Time::FromDoubleT(0) in extension history API. BUG=none TEST=non Review URL: http://codereview.chromium.org/3295001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58953 0039d316-1c4b-4281-b951-d872f2087c98
* Try to fix Crash at gfx::CGImageToSkBitmap.jianli@chromium.org2010-09-091-0/+2
| | | | | | | | | | | The fix is to add the check for NULL context since skia::BitmapPlatformDevice::Create might return NULL. BUG=54880 TEST=none Review URL: http://codereview.chromium.org/3352014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58952 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: change tabpose shortcut to cmd-ctrl-t (matches camino)thakis@chromium.org2010-09-091-5/+33
| | | | | | | | BUG=50307 Review URL: http://codereview.chromium.org/3337019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58951 0039d316-1c4b-4281-b951-d872f2087c98
* For for CF test failure introduced by CL ↵twiz@google.com2010-09-092-9/+10
| | | | | | | | | | | | | | | (http://codereview.chromium.org/3295019) The problem is that by allowing ActiveX controls to hook top-level requests, the redirect in the ChromeFrameTestWithWebServer.WidgetModeIE_SrcProperty was being forwarded to the host browser in IE8. BUG=54920 TEST=ChromeFrameTestWithWebServer.WidgetModeIE_SrcProperty TBR=ananta Review URL: http://codereview.chromium.org/3325019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58950 0039d316-1c4b-4281-b951-d872f2087c98
* Make the content browser in ChromeOS honor the DOM UI font setting.jshin@chromium.org2010-09-0926-38/+32
| | | | | | | | | | | | | | | | | | | | | | | At the moment, no font-family is specified. In that case, serif font is picked by default by Chrome (exception being CJK for which sans-serif is picked). Adding an attribute i18n-values for font-family will set up font-family for the file. I'm not setting font-size because filebrowse.html uses em font-size widely and the default value of 84% (set in locale_settings_cros.grd) will disrupt the layout. Change the DOM UI font for ChromeOS from 'Droid Sans' to 'Chrome Droid Sans'. This may change again, but this matches the font used in the native UI (as specified in gtkrc file) for now. In addition, just as a 'sanitization', enclose font names (IDS_WEB_FONT_FAMILY) with a space with a pair of single quotation marks. BUG=chromiumos:6067 (http://crosbug.com/6067) TEST=Build Chrome for ChromeOS and gmerge it to your build. Content browser does not use serif font any more. Instead, it uses 'Chrome Droid Sans'. Review URL: http://codereview.chromium.org/3295010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58949 0039d316-1c4b-4281-b951-d872f2087c98
* Only send out warning if there is benchmark running. Otherwise, you'll get a ↵lzheng@chromium.org2010-09-092-4/+15
| | | | | | | | | | | warning every time you open a new page after you start the extension. Update extension version to publish in gallery. BUG=none TEST=Use the extension Review URL: http://codereview.chromium.org/3332011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58948 0039d316-1c4b-4281-b951-d872f2087c98
* Add database_update_in_progress_ in SafeBrowsingService to indicate if thelzheng@chromium.org2010-09-093-19/+52
| | | | | | | | | | | | database is still changing. This could be used in the end to end safebrowsing test so we only verify database after this flag is set to false. BUG=none TEST=safe_browsing_browsertest.cc Review URL: http://codereview.chromium.org/3258010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58947 0039d316-1c4b-4281-b951-d872f2087c98
* Further integration of 2D mode. This change supports calltype=v, ↵fransiskusx@google.com2010-09-0913-64/+478
| | | | | | | | | | | | | transparancy, and image transformation. Currently only support Linux and compiled when renderer = cairo. TEST= I compiled with renderer = cairo and it worked. Also I compiled with renderer = gl and it worked. BUG=none Review URL: http://codereview.chromium.org/3272003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58946 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Try to get tabpose unit tests working again.thakis@chromium.org2010-09-096-37/+27
| | | | | | | | | | | | | | | The original problem was that the test plays an animation that outlives the test. When the animation is done, the tab strip model observer tries to unregister itself, but the registry died when the test exited already. My faulty fix was to reset the observer as soon as the end animation starts. This has the problem that the end animation will try to access stale objects: TabContentss are destroyed when the test exits, but the exit animation still tries to access them when drawing ThumbnailLayers (because the observer didn't get a notification that these were dead, since it was unregistered). This (hopefully better) fix now unregisters the observer directly before the tab strip goes away. BUG= 54323,53893,54342 TEST=unit tests pass, valgrind stays green Review URL: http://codereview.chromium.org/3304014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58945 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58910 - This broke the "Google Chrome" compile.nsylvain@chromium.org2010-09-095-214/+107
| | | | | | | | | | | | | | | | | | | Original description: Added a media UI test case for fullscreen video implementation for Windows (which is not committed yet). However, it is currently disabled until the webkit patches are here. Also changed the other cases in media_uitest.cc to stop using Sleep() in test code. Instead, NotificationObserver and NotificationRegistrar are used. Thirdly, moved media_uitest.cc from ui_tests to interactive_ui_tests. TEST=ui_tests, interactive_ui_tests BUGS=54838 Review URL: http://codereview.chromium.org/3322009 TBR=imcheng@chromium.org Review URL: http://codereview.chromium.org/3318020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58944 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58921 - Mark MediaBrowserTest.VideoBearTheora as FLAKY on Mac OS.nsylvain@chromium.org2010-09-091-8/+1
| | | | | | | | | | TBR=imcheng@chromium.org BUG=54939 TBR=bauerb@chromium.org Review URL: http://codereview.chromium.org/3364016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58943 0039d316-1c4b-4281-b951-d872f2087c98
* You can't point a DEPS entry to a directory that already exists! This is makingnsylvain@chromium.org2010-09-090-0/+0
| | | | | | | SVN fail and forcing a full checkout on all the bots for each build cycle. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58942 0039d316-1c4b-4281-b951-d872f2087c98
* Add termination of the chrome frame helper process to the uninstaller.robertshield@chromium.org2010-09-093-18/+36
| | | | | | | | | | | Also, alphabetize constants in util_constants.h|cc. BUG=53127 TEST=Uninstall user-level Chrome Frame. The chrome_frame_helper.exe process is no longer running. Review URL: http://codereview.chromium.org/3298020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58940 0039d316-1c4b-4281-b951-d872f2087c98
* Constants for the disable printing policygfeher@chromium.org2010-09-097-1/+12
| | | | | | | | | | | Define constants for policy kPrintingEnabled and its corresponding preference. BUG=54380 TEST=none Review URL: http://codereview.chromium.org/3292015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58939 0039d316-1c4b-4281-b951-d872f2087c98
* Updating trunk VERSION from 520.0 to 521.0chrome-release@google.com2010-09-091-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58937 0039d316-1c4b-4281-b951-d872f2087c98
* Adds chromeos option to build-bisect.sky@chromium.org2010-09-091-2/+2
| | | | | | | | | BUG=none TEST=nome Review URL: http://codereview.chromium.org/3319015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58933 0039d316-1c4b-4281-b951-d872f2087c98
* Adding additional ClientLogin error messages parsing.nkostylev@chromium.org2010-09-098-2/+121
| | | | | | | | | | | | | | | By default use the same behavior as INVALID_GAIA_CREDENTIALS. Might be used as additional error info or to show different UI error message. ClientLogin API http://code.google.com/apis/accounts/docs/AuthForInstalledApps.html BUG= http://crosbug.com/6379 TEST=Added. Review URL: http://codereview.chromium.org/3335006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58931 0039d316-1c4b-4281-b951-d872f2087c98
* Give time for environment estimation and detect the no-speech case.satish@chromium.org2010-09-096-47/+198
| | | | | | | | | | | | | | | | Environment estimation helps establish a baseline against which the endpointer compares to find beginning and end of speech. We now do this estimation for a few hundred milliseconds before showing the speech UI asking user to speak. Using this updated endpointer we also detect if no speech was heard for many seconds and if so inform the delegate as an error. In a future CL we'll allow the user to easily retry recognition in these error cases. BUG=53598 TEST=unit_tests --gtest_filter=SpeechRecognizerTests.* Review URL: http://codereview.chromium.org/3341020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58930 0039d316-1c4b-4281-b951-d872f2087c98
* [Win] Add per-plugin exceptions to content settings.bauerb@chromium.org2010-09-099-21/+516
| | | | | | | | | | | Screenshot: http://imgur.com/yxEzO.png BUG=39252 TEST=PluginExceptionsTableModel.* Review URL: http://codereview.chromium.org/3307014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58929 0039d316-1c4b-4281-b951-d872f2087c98
* Ignore very short Y move to prevent the window from shaking up and down.yusukes@chromium.org2010-09-091-0/+10
| | | | | | | | | BUG=chromium-os:6460 TEST=see the bug. Review URL: http://codereview.chromium.org/3355016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58928 0039d316-1c4b-4281-b951-d872f2087c98
* Mark WorkerTest.QueuedSharedWorkerShutdown as flaky on Mac, it times out.bauerb@chromium.org2010-09-091-1/+8
| | | | | | | BUG=42641 TBR=atwilson@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58927 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58916 - WebKit Roll 66952->67063bauerb@chromium.org2010-09-091-1/+1
| | | | | | | | | | | | | BUG=none TEST=trybots & canary TBR=dpranke Review URL: http://codereview.chromium.org/3296014 TBR=ukai@chromium.org Review URL: http://codereview.chromium.org/3300024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58926 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58920 - Create a DefaultPrefStore to hold registered ↵pam@chromium.org2010-09-0916-368/+144
| | | | | | | | | | | | | | | | | application-default preference values. This allows notifications to be sent properly when another PrefStore takes control from a default value. BUG=52719 TEST=covered by PrefValueStoreTest.* unit tests Review URL: http://codereview.chromium.org/3331016 TBR=pam@chromium.org [Reverting because it causes PrefsControllerTest.ValidateCustomHomePagesTable to crash on Mac.] Review URL: http://codereview.chromium.org/3353019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58925 0039d316-1c4b-4281-b951-d872f2087c98
* Disable PrefsControllerTest.ValidateCustomHomePagesTable, it crashes.bauerb@chromium.org2010-09-091-1/+2
| | | | | | | BUG=54950 TBR=pam@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58924 0039d316-1c4b-4281-b951-d872f2087c98
* Disable BrowserWindowControllerTest.TestNormal, it crashes.bauerb@chromium.org2010-09-091-1/+2
| | | | | | | BUG=54945 TBR=jrg@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58923 0039d316-1c4b-4281-b951-d872f2087c98
* Mark PPAPITest.Scrollbar as flaky on Windows as well.bauerb@chromium.org2010-09-091-4/+0
| | | | | | | TBR=jam@chromium.org BUG=48544 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58922 0039d316-1c4b-4281-b951-d872f2087c98
* Mark MediaBrowserTest.VideoBearTheora as FLAKY on Mac OS.bauerb@chromium.org2010-09-091-1/+8
| | | | | | | TBR=imcheng@chromium.org BUG=54939 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58921 0039d316-1c4b-4281-b951-d872f2087c98
* Create a DefaultPrefStore to hold registered application-default preference ↵pam@chromium.org2010-09-0916-144/+368
| | | | | | | | | | | | values. This allows notifications to be sent properly when another PrefStore takes control from a default value. BUG=52719 TEST=covered by PrefValueStoreTest.* unit tests Review URL: http://codereview.chromium.org/3331016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58920 0039d316-1c4b-4281-b951-d872f2087c98
* Update ppapi to r238.darin@chromium.org2010-09-091-1/+1
| | | | | | | | TBR=brettw Review URL: http://codereview.chromium.org/3323017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58919 0039d316-1c4b-4281-b951-d872f2087c98
* gitignore: Add /chrome/browser/extensions/default_extensions/chromeosdpolukhin@chromium.org2010-09-091-0/+1
| | | | | | | | | | BUG=none TEST="git status" TBR=skerner@chromium.org Review URL: http://codereview.chromium.org/3290017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58918 0039d316-1c4b-4281-b951-d872f2087c98
* Remove default apps for Chrome OS from public repositorydpolukhin@chromium.org2010-09-092-23/+1
| | | | | | | | | BUG=chromium-os:6318 TEST=none Review URL: http://codereview.chromium.org/3353016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58917 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit Roll 66952->67063ukai@chromium.org2010-09-091-1/+1
| | | | | | | | | | BUG=none TEST=trybots & canary TBR=dpranke Review URL: http://codereview.chromium.org/3296014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58916 0039d316-1c4b-4281-b951-d872f2087c98
* Pass --replace to ibus-daemon to terminate a stale ibus-daemon process.yusukes@chromium.org2010-09-091-1/+2
| | | | | | | | | | | Stale ibus-daemon processes should not exist, but just in case. BUG=chromium-os:6515 TEST=manually checked that ibus-daemon can start with the option. Review URL: http://codereview.chromium.org/3341022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58915 0039d316-1c4b-4281-b951-d872f2087c98
* Change UI font at startup time if necessary, based on the UI locale.satorux@chromium.org2010-09-097-21/+64
| | | | | | | | | | | | | | | | | | | | | | As of writing, ChromeDroidSans is used as the UI font (see /etc/gtk-2.0/gtkrc). This setting does not work well for Japanese users as Chinese glyphs are used for Kanji characters. For Japanese UI, we should use a Japanese font. Introduce IDS_UI_FONT_FAMILY_CROS to control the UI font based on the UI locale. For now, app_locale_settings_ja.xtb only contains a non-default value: IPAPGothic. Just for the record, I originally tried to use "DroidSans Japanese" but for some reason, this caused space characters (0x20) to be garbled in the wrench menu. Hence, IPAPGotchic is chosen for now. TEST=manually on the netbook, and ubuntu BUG=chromium-os:4038 Review URL: http://codereview.chromium.org/3275008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58913 0039d316-1c4b-4281-b951-d872f2087c98
* Relax DCHECK in SafeBrowsingDatabaseNew::CacheHashResults().shess@chromium.org2010-09-091-5/+10
| | | | | | | | | | | | Function is called on the I/O thread rather than the safe-browsing thread. BUG=54726 TEST=Browse to an URL on the malware or phishing list in debug build, no DCHECK. Review URL: http://codereview.chromium.org/3348015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58912 0039d316-1c4b-4281-b951-d872f2087c98
* Added a media UI test case for fullscreen video implementation for Windows ↵imcheng@chromium.org2010-09-095-107/+214
| | | | | | | | | | | | | | | (which is not committed yet). However, it is currently disabled until the webkit patches are here. Also changed the other cases in media_uitest.cc to stop using Sleep() in test code. Instead, NotificationObserver and NotificationRegistrar are used. Thirdly, moved media_uitest.cc from ui_tests to interactive_ui_tests. TEST=ui_tests, interactive_ui_tests BUGS=54838 Review URL: http://codereview.chromium.org/3322009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58910 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58905 - Unneeded suppression.rsesek@chromium.org2010-09-091-7/+0
| | | | | | | | | | | | | | | Add a leak suppression for browser_sync::ClearDataCommandTest_ClearDataCommandExpectSucess test. TBR=tim BUG=54915 TEST=Linux Valgrind 3 Review URL: http://codereview.chromium.org/3302018 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/3362013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58908 0039d316-1c4b-4281-b951-d872f2087c98