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 57 matching lines @@
     case CONTENT_SETTING_BLOCK:
       return false;
     case CONTENT_SETTING_ALLOW:
       return true;
     case CONTENT_SETTING_ASK:
     default:
       return true;
   }
 }
 
 std::string GetStringForContentSettingsType(

[Bernhard Bauer, 2015/10/07 11:38:21]

Thanks for finding these!

I took a look at this method, and it's only used to marshal content settings to
Java, where only ALLOW and BLOCK are used. Really, this is kind of unnecessary
to do via strings (I suspect whoever implemented it was looking at the Web UI
version), because it could just use the numeric values instead. I can do that,
as I've found a bunch of other things to clean up in this file anyway ☺

[Deepak, 2015/10/07 13:54:43]

Acknowledged.

     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";
     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);
 }