options: fix content settings exceptions dialog regression.

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 1191 matching lines @@
     const base::ListValue* args,
     ContentSettingsType type) {
   std::string mode;
   bool rv = args->GetString(1, &mode);
   DCHECK(rv);
 
   std::string pattern;
   rv = args->GetString(2, &pattern);
   DCHECK(rv);
 
-  // The third argument to this handler is optional.
+  // The fourth argument to this handler is optional.
   std::string secondary_pattern;
-  if (args->GetSize() == 3U) {
+  if (args->GetSize() >= 4U) {

[Dan Beam, 2014/05/01 23:43:33]

^ the fix that took me 3s to write

[Lei Zhang, 2014/05/01 23:54:30]

Curious, what's args->GetString(0, &foo) ?

[Dan Beam, 2014/05/02 00:43:15]

see below

     rv = args->GetString(3, &secondary_pattern);
     DCHECK(rv);
   }
 
   HostContentSettingsMap* settings_map =
       mode == "normal" ? GetContentSettingsMap() :
                          GetOTRContentSettingsMap();
   if (settings_map) {
     settings_map->SetWebsiteSetting(
         ContentSettingsPattern::FromString(pattern),
@@ skipping 139 matching lines @@
       content::RecordAction(
           UserMetricsAction("Options_DefaultMIDISysExSettingChanged"));
       break;
     default:
       break;
   }
 }
 
 void ContentSettingsHandler::RemoveException(const base::ListValue* args) {
   std::string type_string;
   CHECK(args->GetString(0, &type_string));

[Dan Beam, 2014/05/02 00:43:15]

^ the type of exception to remove (e.g. "cookies", "location")

 
   // Zoom levels are no actual content type so we need to handle them
   // separately. They would not be recognized by
   // ContentSettingsTypeFromGroupName.
   if (type_string == kZoomContentType) {
     RemoveZoomLevelException(args);
     return;
   }
 
   ContentSettingsType type = ContentSettingsTypeFromGroupName(type_string);
@@ skipping 179 matching lines @@
 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   // Exceptions apply only when the feature is enabled.
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options