options: loosen up ContentSettingsHandler::RemoveException() as the JS sometimes

options: loosen up ContentSettingsHandler::RemoveException() as the JS sometimes
doesn't pass a third argument to chrome.send('removeException');

R=thestig@chromium.org
BUG=362362
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266287

[Dan Beam, 2014-04-19 03:15:23]

battre@ is OOO, R= to markusheintz@

here's where this is called with only 3 args:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/res...

[Dan Beam, 2014-04-25 02:28:06]

-markusheintz, +thestig (super simple CL, doesn't really matter who reviews)

[Lei Zhang, 2014-04-25 02:28:16]

https://codereview.chromium.org/243803004/diff/1/chrome/browser/ui/webui/opti...
File chrome/browser/ui/webui/options/content_settings_handler.cc (right):

https://codereview.chromium.org/243803004/diff/1/chrome/browser/ui/webui/opti...
chrome/browser/ui/webui/options/content_settings_handler.cc:1214:
args->GetString(3, &secondary_pattern);
This can fail either before 3 is out of bounds or because the ListValue entry is
bogus. We should check for the latter case. How about?

if (args->size() == 3) {
  rv = args->GetString(3, &secondary_pattern);
  DCHECK(rv);
}

[Dan Beam, 2014-04-25 04:11:08]

https://codereview.chromium.org/243803004/diff/1/chrome/browser/ui/webui/opti...
File chrome/browser/ui/webui/options/content_settings_handler.cc (right):

https://codereview.chromium.org/243803004/diff/1/chrome/browser/ui/webui/opti...
chrome/browser/ui/webui/options/content_settings_handler.cc:1214:
args->GetString(3, &secondary_pattern);
On 2014/04/25 02:28:16, Lei Zhang wrote:
> This can fail either before 3 is out of bounds or because the ListValue entry
is
> bogus. We should check for the latter case. How about?
> 
> if (args->size() == 3) {
>   rv = args->GetString(3, &secondary_pattern);
>   DCHECK(rv);
> }

Done.

[Lei Zhang, 2014-04-25 04:41:07]

lgtm

[commit-bot: I haz the power, 2014-04-25 08:26:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/243803004/20001

[commit-bot: I haz the power, 2014-04-25 23:35:28]

Change committed as 266287