Making structure for ContentSettings and its corresponding strings.

chrome/browser/extensions/api/content_settings/content_settings_helpers.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/extensions/api/content_settings/content_settings_helpers.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/content_settings/core/browser/website_settings_info.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/url_pattern.h"
 
 namespace {
 
 const char kNoPathWildcardsError[] =
     "Path wildcards in file URL patterns are not allowed.";
 const char kNoPathsError[] = "Specific paths are not allowed.";
 const char kInvalidPatternError[] = "The pattern \"*\" is invalid.";
 
 const char* const kContentSettingNames[] = {
   "default",
   "allow",
   "block",
   "ask",
-  "session_only",

[Bernhard Bauer, 2015/10/05 11:15:41]

We are probably going to have to do this the other way around: these strings are
part of the public extension API, so we can't change them. What we can change is
the strings used internally, as those are just identifiers for Web UI. So let's
update the internal strings to match this, and update the corresponding Web UI.

[Deepak, 2015/10/05 12:14:38]

I have removed this array here, and updated the strings in
content_settings_utils.cc file.

-  "detect_important_content"
+  "session",
+  "detect"
 };
 static_assert(arraysize(kContentSettingNames) <=
               CONTENT_SETTING_NUM_SETTINGS,
               "kContentSettingNames has an unexpected number of elements");
 
 // TODO(bauerb): Move this someplace where it can be reused.
 std::string GetDefaultPort(const std::string& scheme) {
   if (scheme == url::kHttpScheme)
     return "80";
   if (scheme == url::kHttpsScheme)
@@ skipping 74 matching lines @@
 
   return CONTENT_SETTINGS_TYPE_DEFAULT;
 }
 
 std::string ContentSettingsTypeToString(ContentSettingsType type) {
   return content_settings::WebsiteSettingsRegistry::GetInstance()
       ->Get(type)
       ->name();
 }
 
 bool StringToContentSetting(const std::string& setting_str,

[Bernhard Bauer, 2015/10/05 11:15:41]

Can we remove this one as well? This version seems to allow
CONTENT_SETTING_DEFAULT, but that is wrong (DEFAULT is not a valid setting).

[Deepak, 2015/10/05 12:14:38]

I think as the return type of this API is bool, so we can keep this API and
functionality we can update.

                             ContentSetting* setting) {
   for (size_t type = 0; type < arraysize(kContentSettingNames); ++type) {
     if (setting_str == kContentSettingNames[type]) {
       *setting = static_cast<ContentSetting>(type);
       return true;
     }
   }
   return false;
 }
 
-const char* ContentSettingToString(ContentSetting setting) {
-  size_t index = static_cast<size_t>(setting);
-  DCHECK_LT(index, arraysize(kContentSettingNames));
-  return kContentSettingNames[index];
-}
-
 }  // namespace content_settings_helpers
 }  // namespace extensions