Site Settings: Use only string values for permissions on the JS side.

chrome/browser/ui/webui/settings/site_settings_handler.cc

 // Copyright 2016 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/settings/site_settings_handler.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 136 matching lines @@
         new BrowsingDataLocalStorageHelper(profile_);
     local_storage_helper->DeleteOrigin(url);
   }
 }
 
 void SiteSettingsHandler::HandleSetDefaultValueForContentType(
     const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
   double content_type;
   CHECK(args->GetDouble(0, &content_type));
-  double default_setting;
-  CHECK(args->GetDouble(1, &default_setting));
+  std::string setting;
+  CHECK(args->GetString(1, &setting));
+  ContentSetting default_setting;
+  CHECK(content_settings::ContentSettingFromString(setting, &default_setting));
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   map->SetDefaultContentSetting(
       static_cast<ContentSettingsType>(static_cast<int>(content_type)),
-      static_cast<ContentSetting>(static_cast<int>(default_setting)));
+      default_setting);
 }
 
 void SiteSettingsHandler::HandleGetDefaultValueForContentType(
     const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
   double type;
   CHECK(args->GetDouble(1, &type));
 
@@ skipping 55 matching lines @@
 
 void SiteSettingsHandler::HandleSetCategoryPermissionForOrigin(
     const base::ListValue* args) {
   CHECK_EQ(4U, args->GetSize());
   std::string primary_pattern;
   CHECK(args->GetString(0, &primary_pattern));
   std::string secondary_pattern;
   CHECK(args->GetString(1, &secondary_pattern));
   double type;
   CHECK(args->GetDouble(2, &type));
-  double value;
-  CHECK(args->GetDouble(3, &value));
+  std::string value;
+  CHECK(args->GetString(3, &value));
 
   ContentSettingsType content_type =
       static_cast<ContentSettingsType>(static_cast<int>(type));
-  ContentSetting setting = static_cast<ContentSetting>(static_cast<int>(value));
+  ContentSetting setting;
+  CHECK(content_settings::ContentSettingFromString(value, &setting));
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::FromString(primary_pattern),
       secondary_pattern.empty() ?
           ContentSettingsPattern::Wildcard() :
           ContentSettingsPattern::FromString(secondary_pattern),
       content_type, "", setting);
 }
 
 }  // namespace settings