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

chrome/browser/ui/webui/settings/site_settings_handler_unittest.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 <memory>
 
 #include "chrome/browser/ui/webui/site_settings_helper.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 107 matching lines @@
   // Test the JS -> C++ -> JS callback path for getting and setting defaults.
   base::ListValue getArgs;
   getArgs.Append(new base::StringValue(kCallbackId));
   getArgs.Append(new base::FundamentalValue(type));
   handler.HandleGetDefaultValueForContentType(&getArgs);
   ValidateDefault(true, 1U);
 
   // Set the default to 'Blocked'.
   base::ListValue setArgs;
   setArgs.Append(new base::FundamentalValue(type));
-  setArgs.Append(new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  setArgs.Append(new base::StringValue("block"));
   handler.HandleSetDefaultValueForContentType(&setArgs);
 
   EXPECT_EQ(2U, web_ui()->call_data().size());
 
   // Verify that the default has been set to 'Blocked'.
   handler.HandleGetDefaultValueForContentType(&getArgs);
   ValidateDefault(false, 3U);
 }
 
 TEST_F(SiteSettingsHandlerTest, Origins) {
   SiteSettingsHandler handler(profile());
   handler.set_web_ui(web_ui());
 
   ContentSettingsType type = CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
 
   // Test the JS -> C++ -> JS callback path for configuring origins, by setting
   // Google.com to blocked.
   base::ListValue setArgs;
   std::string google("http://www.google.com");
   setArgs.Append(new base::StringValue(google));  // Primary pattern.
   setArgs.Append(new base::StringValue(google));  // Secondary pattern.
   setArgs.Append(new base::FundamentalValue(type));
-  setArgs.Append(new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  setArgs.Append(new base::StringValue("block"));
   handler.HandleSetCategoryPermissionForOrigin(&setArgs);
   EXPECT_EQ(1U, web_ui()->call_data().size());
 
   // Verify the change was successful.
   base::ListValue listArgs;
   listArgs.Append(new base::StringValue(kCallbackId));
   listArgs.Append(new base::FundamentalValue(type));
   handler.HandleGetExceptionList(&listArgs);
   ValidateOrigin(google, google, "block", "preference", 2U);
 
   // Reset things back to how they were.
   base::ListValue resetArgs;
   resetArgs.Append(new base::StringValue(google));
   resetArgs.Append(new base::StringValue(google));
   resetArgs.Append(new base::FundamentalValue(type));
   handler.HandleResetCategoryPermissionForOrigin(&resetArgs);
   EXPECT_EQ(3U, web_ui()->call_data().size());
 
   // Verify the reset was successful.
   handler.HandleGetExceptionList(&listArgs);
   ValidateNoOrigin(4U);
 }
 
 }  // namespace settings