Making structure for ContentSettings and its corresponding strings.

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 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/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
@@ skipping 67 matching lines @@
 std::string GetStringForContentSettingsType(
     ContentSetting content_setting) {
   switch (content_setting) {
     case CONTENT_SETTING_BLOCK:
       return "block";
     case CONTENT_SETTING_ALLOW:
       return "allow";
     case CONTENT_SETTING_ASK:
       return "ask";
     case CONTENT_SETTING_SESSION_ONLY:
-      return "session";
+      return "session_only";

[Bernhard Bauer, 2015/10/05 12:34:28]

I think you need to update the corresponding Web UI now. Luckily, "session" is
only used for cookies, and "detect" only for plugins, so you can search the
content settings Web UI for those.

[Deepak, 2015/10/05 14:25:32]

Done.

     case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
-      return "detect";
+      return "detect_important_content";
     case CONTENT_SETTING_NUM_SETTINGS:
       return "num_settings";
     case CONTENT_SETTING_DEFAULT:
     default:
       return "default";
   }
 }
 
 bool IsContentSettingManaged(ContentSettingsType content_settings_type) {
   std::string source;
@@ skipping 866 matching lines @@
     ContentSettingsType content_type) {
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> android_permission =
       Java_PrefServiceBridge_getAndroidPermissionForContentSetting(
           env, content_type);
   if (android_permission.is_null())
     return std::string();
 
   return ConvertJavaStringToUTF8(android_permission);
 }