summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_settings
Commit message (Collapse)AuthorAgeFilesLines
* Remove content settings default providers from the host content settings map. marja@chromium.org2011-10-1020-1219/+1124
| | | | | | | | | | | | | | | | | Add a DefaultProvider for user default settings and integrate the DefaultPolicyProvider into the PolicyProvider. The real work was done by markusheintz@chromium.org and the original CL is http://codereview.chromium.org/7976032/ BUG=63656 TEST=host_content_settings_map_unittest.cc, content_settings_policy_provider_unittest.cc, content_settings_default_provider_unittest.cc Review URL: http://codereview.chromium.org/8137024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104704 0039d316-1c4b-4281-b951-d872f2087c98
* Deadlock fix for PrefDefaultProvider.marja@chromium.org2011-10-071-11/+19
| | | | | | | | | | | | | It used to send out notifications while holding its lock, and the upper layer called its getters when receiving the notification -> deadlock. This was recently exposed by my change (revision 103260) which made the UI listen to these notifications. BUG=99315 TEST=Manual; see bug Review URL: http://codereview.chromium.org/8171007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104450 0039d316-1c4b-4281-b951-d872f2087c98
* OriginIdentifierValueMap refactoring: Change the internal storage from a ↵marja@chromium.org2011-09-2916-206/+312
| | | | | | | | | | | | list to a map. BUG=63656 TEST=OriginIdentifierValueMapTest.{IterateEmpty, IterateNonempty}, existing tests: OriginIdentifierValueMapTest.*, PrefProviderTest.*, PolicyProviderTest.* Review URL: http://codereview.chromium.org/7990003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103266 0039d316-1c4b-4281-b951-d872f2087c98
* Use OriginIdentifierValueMap internally in ExtensionContentSettingsStore.bauerb@chromium.org2011-09-237-65/+80
| | | | | | | | | | | | | | Plus some cleanups: * Use a lock in PolicyProvider::GetContentSettingValue * Sanity checks when converting a Value to a ContentSetting. BUG=88533 TEST=unit tests Review URL: http://codereview.chromium.org/7992004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102515 0039d316-1c4b-4281-b951-d872f2087c98
* Moving ContentSettingsPattern and ContentSettingsPatternParser from ↵marja@chromium.org2011-09-2114-1882/+9
| | | | | | | | | | | | | chrome/browser/content_settings to chrome/common. This is needed for transmitting image-related content settings to the renderer. BUG=81179 TEST=NONE Review URL: http://codereview.chromium.org/7885006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102088 0039d316-1c4b-4281-b951-d872f2087c98
* Add ChromeRenderViewHostTestHarness to get rid of the dependency from RVHTH ↵jochen@chromium.org2011-09-141-4/+3
| | | | | | | | | | | to profile BUG=90443 TEST=everything still works Review URL: http://codereview.chromium.org/7892007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101037 0039d316-1c4b-4281-b951-d872f2087c98
* Move the ViewHostMsg_AppCacheAccessed message handling out of Chrome and ↵ananta@chromium.org2011-09-082-13/+13
| | | | | | | | | | | | | | | replace it with a notification call on the TabContentsObserver interface. This is fine as this message is just a notification that the app cache was accessed. Continuing changes to get rid of the pattern of IPC messages spanning across content and chrome. BUG=87335 TEST=No change in functionality Review URL: http://codereview.chromium.org/7857003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100251 0039d316-1c4b-4281-b951-d872f2087c98
* Add policies for notifications exceptions.markusheintz@chromium.org2011-09-081-1/+17
| | | | | | | | | | BUG=63182 TEST=none Review URL: http://codereview.chromium.org/7851015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100204 0039d316-1c4b-4281-b951-d872f2087c98
* Address post commit comments for CL http://codereview.chromium.org/7828022/markusheintz@chromium.org2011-09-082-13/+11
| | | | | | | | | BUG=81825 TEST=none Review URL: http://codereview.chromium.org/7837038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100147 0039d316-1c4b-4281-b951-d872f2087c98
* - Add a method to the HostContentSettings map to return the |Value| of a ↵markusheintz@chromium.org2011-09-056-54/+179
| | | | | | | | | | | | | | | | | | | | | | content setting instead of the type ContentSetting. The HostContentSettingsMap should allow storing arbitrary |Value|s instead of only |ContentSettings| for content settings types (BTW: content settings should be called website settings). This allows to add other content settings type(website settings types) to the host content settings map that require more complex settings than ALLOW, BLOCK, ASK, ... . CONTENT_TYPE_AUTO_SELECT_CERTIFICATE is one example of such a content settings type. CONTENT_TYPE_AUTO_SELECT_CERTIFICATE requires a map with certain criteria that a certificate must match to be selected. - Add filter to the AutoSelectCertificate policy. Instead of only giving a list of origin patterns that specify origins for which client certificates should be auto selected, each origin pattern now also requires a filter with certificate criteria. This is the second CL in a series and follows CL http://codereview.chromium.org/7831004/ BUG=63656, 81825 TEST=host_content_settings_map_unittest.cc, content_settings_policy_provider_unittests.cc TBR=pam@chromium.org Review URL: http://codereview.chromium.org/7828022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99672 0039d316-1c4b-4281-b951-d872f2087c98
* Add a method to the content_settings::ProviderInterface to return the ↵markusheintz@chromium.org2011-09-0512-22/+183
| | | | | | | | | | | | | | | | | | |Value| of a content setting instead of a |ContentSetting| type. The HostContentSettingsMap should allow storing arbitrary |Value|s instead of only |ContentSettings| for content settings types (BTW: content settings should be called website settings). This allows to add other content settings type(website settings types) to the host content settings map that require more complex settings than ALLOW, BLOCK, ASK, ... . CONTENT_TYPE_AUTO_SELECT_CERTIFICATE is one example of such a content settings type. CONTENT_TYPE_AUTO_SELECT_CERTIFICATE requires a map with certain criteria that a certificate must match to be selected. This is the first CL to migrate the content settings code to user |Value|s instead of |ContentSetting|s. BUG=63656, 81825 TEST=host_content_settings_map_unittest.cc, content_settings_pref_provider.cc, content_settings_policy_provider.cc, content_settings_provider_unittest.cc Review URL: http://codereview.chromium.org/7831004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99639 0039d316-1c4b-4281-b951-d872f2087c98
* Remove ContentSettingsRule and ContentSettingsRules types in ↵markusheintz@chromium.org2011-09-052-24/+6
| | | | | | | | | | | | | content_settings::PolicyProvider. The change removes one step in the process of loading managed (= by policy) content settings form the preferences that store the policy values. Instead of loading the content settings into a vector and passing this vector to another method that stores the content settings in the in-memory map , content settings are directly stored in the in-memory map. This eliminates one pass over all content settings. That is not needed. BUG=63656 TEST=content_settings_policy_provider_unittests.cc Review URL: http://codereview.chromium.org/7811019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99632 0039d316-1c4b-4281-b951-d872f2087c98
* Move web intents switch to content_switches.gbillock@chromium.org2011-09-021-0/+1
| | | | | | | | | | | R=jam@chromium.org BUG=None TEST=None Review URL: http://codereview.chromium.org/7821010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99292 0039d316-1c4b-4281-b951-d872f2087c98
* Migrate Obsolete NotificationsSettings and remove ↵markusheintz@chromium.org2011-08-317-531/+337
| | | | | | | | | | | | | | | content_settings::NotificationsProvider. BUG=63656 TEST=host_content_settings_map_unittest.cc, content_settings_pref_provider.cc, desktop_notifications_service_unittest.cc Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=98938 Review URL: http://codereview.chromium.org/7655019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98960 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unused static initializer in content_settings_policy_provider.ccmarkusheintz@chromium.org2011-08-311-5/+0
| | | | | | | | | BUG=94879 TEST=none Review URL: http://codereview.chromium.org/7785024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98959 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 98938 - Migrate Obsolete NotificationsSettings and remove ↵markusheintz@chromium.org2011-08-317-337/+531
| | | | | | | | | | | | | | | | content_settings::NotificationsProvider. BUG=63656 TEST=host_content_settings_map_unittest.cc, content_settings_pref_provider.cc, desktop_notifications_service_unittest.cc Review URL: http://codereview.chromium.org/7655019 TBR=markusheintz@chromium.org Review URL: http://codereview.chromium.org/7810017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98941 0039d316-1c4b-4281-b951-d872f2087c98
* Migrate Obsolete NotificationsSettings and remove ↵markusheintz@chromium.org2011-08-317-531/+337
| | | | | | | | | | | | | content_settings::NotificationsProvider. BUG=63656 TEST=host_content_settings_map_unittest.cc, content_settings_pref_provider.cc, desktop_notifications_service_unittest.cc Review URL: http://codereview.chromium.org/7655019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98938 0039d316-1c4b-4281-b951-d872f2087c98
* Switch ChromeTestSuite to the same convention as ContentTestSuite:phajdan.jr@chromium.org2011-08-273-8/+5
| | | | | | | | | | | | | | | | | the test suite implicitly provides global resources for each test, but they're re-initialized between each test. The performance overhead is negligible. We need that to continue moving tests from unit_tests to content_unittests. Because of shared test fixtures the test suites need to be compatible. BUG=90443 Review URL: http://codereview.chromium.org/7744039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98526 0039d316-1c4b-4281-b951-d872f2087c98
* * Wire up the delete command in the cookie tree UI to actually delete ↵michaeln@google.com2011-08-251-1/+1
| | | | | | | | | | | | | | | indexedDBs. Also cleaned up some internal structures used by the UI layer. * Clean up some loose ends around the transition from sqlite backing to leveldb backing. Code had not been updated to reflect that the indexedDBpath is a directory path instead of a file path. * Fix a problem with reporting inconsistent size value to the quota manager. Now we always compute deltas against a cached size value and don't change the cached size value w/o reporting a delta. * Fix a problem with erroneously accessing the filesystem for queries about indexed db usage when working with incognito profiles. BUG=56249,76641 Review URL: http://codereview.chromium.org/7692016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98352 0039d316-1c4b-4281-b951-d872f2087c98
* Don't sync or migrate obsolete preferences in the incognito host content ↵markusheintz@chromium.org2011-08-251-12/+14
| | | | | | | | | | | | settings map. BUG=93366 TEST=TODO Review URL: http://codereview.chromium.org/7740011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98224 0039d316-1c4b-4281-b951-d872f2087c98
* - Add a new content settings type AUTO-SELECT-CERTIFICATE. The default value ↵markusheintz@chromium.org2011-08-245-4/+134
| | | | | | | | | | | | | | | | | | of the new content settings type AUTO-SELECT-CERTIFICATE is CONTENT_SETTING_ASK - Add a policy for whitelisting origins for which client certificates should be auto selected. - Add a policy to set a default setting for the auto select certificates setting. BUG=81825 TEST=host_content_settings_map_unittest.cc, content_settings_policy_provider_unit_test.cc, configuration_policy_pref_store_unittest.cc Review URL: http://codereview.chromium.org/7537025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98026 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed a few places that should know about CONTENT_SETTINGS_TYPE_INTENTSgroby@chromium.org2011-08-241-0/+1
| | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7711016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97970 0039d316-1c4b-4281-b951-d872f2087c98
* The following methods of the HostContentSettingsMaps are not supposed to be ↵markusheintz@chromium.org2011-08-222-26/+25
| | | | | | | | | | | | | | | used by external code: - GetNonDefaultContentSetting - GetNonDefaultContentSettings BUG=63656 TEST=host_content_settings_map_unittest.cc Review URL: http://codereview.chromium.org/7663007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97619 0039d316-1c4b-4281-b951-d872f2087c98
* Prefix all IPC messages used by src\chrome with Chrome. For e.g ↵ananta@chromium.org2011-08-191-4/+4
| | | | | | | | | | | | | | | ChromeViewMsg_, ChromeViewHostMsg, etc. This makes it easier to identify which messages are specific to content and chrome. This is a preparation CL for bug http://code.google.com/p/chromium/issues/detail?id=87335 which requires IPC's to not span across content and chrome. When IPC's cross these boundaries they need to be handled as API calls. BUG=87335 Review URL: http://codereview.chromium.org/7631063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97536 0039d316-1c4b-4281-b951-d872f2087c98
* Enable WebIntents blacklist UI (redo of #7645034)groby@chromium.org2011-08-183-0/+16
| | | | | | | | | | BUG=ContentSettingBubbleControllerTest.Init TEST=Run Chromium with -enable-web-intents, go to content settings/manage exceptions, see UI Review URL: http://codereview.chromium.org/7670052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97357 0039d316-1c4b-4281-b951-d872f2087c98
* Don't update the obsolete geolocation preference while migrating it. markusheintz@chromium.org2011-08-181-5/+5
| | | | | | | | | | | BUG=93366 TEST=content_settings_pref_provider_unittest.cc host_content_settings_map_unittest.cc Review URL: http://codereview.chromium.org/7655043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97347 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 4)thestig@chromium.org2011-08-181-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7670016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97286 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 97190 - Enable WebIntents blacklist UIrvargas@google.com2011-08-173-16/+0
| | | | | | | | | | | | | | | hidden behind -enable-web-intents commandline flag BUG=none TEST=Run Chromium with -enable-web-intents, go to content settings/manage exceptions, see UI Review URL: http://codereview.chromium.org/7645034 TBR=groby@chromium.org Review URL: http://codereview.chromium.org/7631030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97217 0039d316-1c4b-4281-b951-d872f2087c98
* Enable WebIntents blacklist UIgroby@chromium.org2011-08-173-0/+16
| | | | | | | | | | | | hidden behind -enable-web-intents commandline flag BUG=none TEST=Run Chromium with -enable-web-intents, go to content settings/manage exceptions, see UI Review URL: http://codereview.chromium.org/7645034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97190 0039d316-1c4b-4281-b951-d872f2087c98
* Migrate geolocation settings to host content settings map and remove the ↵markusheintz@chromium.org2011-08-154-57/+355
| | | | | | | | | | | | | geolocation settings map. BUG=63656 TEST=host_content_settings_map_unittest.cc, content_settings_pref_provider_unittest.cc Review URL: http://codereview.chromium.org/7484072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96808 0039d316-1c4b-4281-b951-d872f2087c98
* base: Fix the TODO in ListValue::Remove().tfarina@chromium.org2011-08-131-6/+6
| | | | | | | | | | | | | Change the return type of Remove() to bool, and add a size_t output parameter. BUG=None TEST=None R=evan@chromium.org Review URL: http://codereview.chromium.org/7618021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96702 0039d316-1c4b-4281-b951-d872f2087c98
* Creat BrowsingDataCookieHelper and CannedBrowsingDataCookieHelper for ↵ycxiao@chromium.org2011-08-122-38/+26
| | | | | | | | | | | | | | | logging cookies at UI thread. Moving from http://codereview.chromium.org/7355025/ BUG=XXXX TEST=BrowsingDataCookieHelperTest TBR=rdsmith Review URL: http://codereview.chromium.org/7601018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96569 0039d316-1c4b-4281-b951-d872f2087c98
* Add preference for managed notifications setting.markusheintz@chromium.org2011-08-122-3/+7
| | | | | | | | | | | BUG=63190 TEST=host_content_settings_map_unittest.cc, content_settings_policy_provider_unittest.cc desktop_notification_service_unittest.cc Review URL: http://codereview.chromium.org/7623006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96548 0039d316-1c4b-4281-b951-d872f2087c98
* Reorganize chrome/test, part #9phajdan.jr@chromium.org2011-08-113-3/+3
| | | | | | | | | TBR=jcivelli BUG=90905 Review URL: http://codereview.chromium.org/7616019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96453 0039d316-1c4b-4281-b951-d872f2087c98
* Fix partially broken pattern keys and delete invalid pattern keys of the ↵markusheintz@chromium.org2011-08-092-31/+139
| | | | | | | | | | | obsolete content settings pattern pref. BUG=90490 TEST=content_settings_pref_provider_unittest.cc Review URL: http://codereview.chromium.org/7529025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95991 0039d316-1c4b-4281-b951-d872f2087c98
* Adding usage entry to chrome://settings/cookies.tzik@chromium.org2011-08-091-0/+1
| | | | | | | | | | | | | BUG=88644,91816,91836 TEST='BrowsingDataQuotaHelperTest.*' Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=95607 Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=95779 Review URL: http://codereview.chromium.org/7387007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95959 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 95607 - Adding usage entry to chrome://settings/cookies.tzik@chromium.org2011-08-081-1/+0
| | | | | | | | | | | | | BUG=88644 TEST='BrowsingDataQuotaHelperTest.*' Review URL: http://codereview.chromium.org/7387007 TBR=tzik@chromium.org Review URL: http://codereview.chromium.org/7491085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95779 0039d316-1c4b-4281-b951-d872f2087c98
* Adding usage entry to chrome://settings/cookies.tzik@chromium.org2011-08-051-0/+1
| | | | | | | | | | BUG=88644 TEST='BrowsingDataQuotaHelperTest.*' Review URL: http://codereview.chromium.org/7387007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95607 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 95534 - Creat BrowsingDataCookieHelper and ↵yzshen@chromium.org2011-08-052-26/+38
| | | | | | | | | | | | | | CannedBrowsingDataCookieHelper for logging cookies at UI thread. BUG=XXX TEST=XXX Review URL: http://codereview.chromium.org/7355025 TBR=ycxiao@chromium.org Review URL: http://codereview.chromium.org/7491049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95575 0039d316-1c4b-4281-b951-d872f2087c98
* Creat BrowsingDataCookieHelper and CannedBrowsingDataCookieHelper for ↵ycxiao@chromium.org2011-08-042-38/+26
| | | | | | | | | | | logging cookies at UI thread. BUG=XXX TEST=XXX Review URL: http://codereview.chromium.org/7355025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95534 0039d316-1c4b-4281-b951-d872f2087c98
* GTTF: Use a fresh TestingBrowserProcess for each test, part #4phajdan.jr@chromium.org2011-08-031-1/+1
| | | | | | | | | | | For a detailed description see part #1, http://codereview.chromium.org/6478005/ BUG=61062 TEST=unit_tests, possibly more Review URL: http://codereview.chromium.org/7465041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95350 0039d316-1c4b-4281-b951-d872f2087c98
* Add a != operator to the ContentSettingsPattern class.markusheintz@chromium.org2011-08-023-0/+24
| | | | | | | | | | BUG=none TEST=content_settings_pattern_unittest.cc Review URL: http://codereview.chromium.org/7549006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95105 0039d316-1c4b-4281-b951-d872f2087c98
* Make content_settings::ParsePatternString more reliable.markusheintz@chromium.org2011-08-024-50/+89
| | | | | | | | | | BUG=90490 TEST=content_settings_utils_unittest.cc Review URL: http://codereview.chromium.org/7533015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95068 0039d316-1c4b-4281-b951-d872f2087c98
* Move more files from chrome/test to chrome/test/base, part #5phajdan.jr@chromium.org2011-08-013-3/+3
| | | | | | | BUG=90905 Review URL: http://codereview.chromium.org/7537033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94995 0039d316-1c4b-4281-b951-d872f2087c98
* Move more files from chrome/test to chrome/test/base, part #4phajdan.jr@chromium.org2011-08-014-4/+4
| | | | | | | BUG=90905 Review URL: http://codereview.chromium.org/7544021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94963 0039d316-1c4b-4281-b951-d872f2087c98
* Move in_process_browser_test and ui_test_utils to chrome/test/basephajdan.jr@chromium.org2011-07-291-2/+2
| | | | | | | BUG=90905 Review URL: http://codereview.chromium.org/7532034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94720 0039d316-1c4b-4281-b951-d872f2087c98
* Removal of Profile from content part 3.avi@chromium.org2011-07-282-8/+14
| | | | | | | | | BUG=76788 TEST=no change visible Review URL: http://codereview.chromium.org/7522018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94511 0039d316-1c4b-4281-b951-d872f2087c98
* Add test to content_settings_pref_provider_unittestmarkusheintz@chromium.org2011-07-271-8/+88
| | | | | | | | | BUG=90490 TEST=content_settings_pref_provider_unittest Review URL: http://codereview.chromium.org/7465035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94302 0039d316-1c4b-4281-b951-d872f2087c98
* FileManagerDialogTest.SelectFileAndCancel flaky.grt@chromium.org2011-07-1943-0/+9443
|\ | | | | | | | | | | | | | | | | BUG=89733 TBR=robertshield@chromium.org TEST=browser_tests Review URL: http://codereview.chromium.org/7447001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93027 0039d316-1c4b-4281-b951-d872f2087c98
* | Roll ANGLE r704:r705jbauman@chromium.org2011-07-1943-9443/+0
| | | | | | | | | | | | | | | | | | BUG= TEST=try Review URL: http://codereview.chromium.org/7375016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93026 0039d316-1c4b-4281-b951-d872f2087c98