Prune some remnants of DSA client certificate support.

chrome/browser/ui/webui/cookies_tree_model_util.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/ui/webui/cookies_tree_model_util.h"
 
 #include <vector>
 
 #include "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "content/public/browser/service_worker_context.h"
 #include "net/cookies/canonical_cookie.h"
-#include "net/ssl/ssl_client_cert_type.h"
 #include "storage/common/fileapi/file_system_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/extension_set.h"
 #endif
 
 namespace {
 
@@ skipping 29 matching lines @@
 const char kKeyTotalUsage[] = "totalUsage";
 const char kKeyTemporaryUsage[] = "temporaryUsage";
 const char kKeyPersistentUsage[] = "persistentUsage";
 
 const char kKeyCertType[] = "certType";
 
 const char kKeyScopes[] = "scopes";
 
 const int64 kNegligibleUsage = 1024;  // 1KiB
 
-std::string ClientCertTypeToString(net::SSLClientCertType type) {
-  switch (type) {
-    case net::CLIENT_CERT_RSA_SIGN:
-      return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_RSA_SIGN);
-    case net::CLIENT_CERT_DSS_SIGN:
-      return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_DSS_SIGN);
-    case net::CLIENT_CERT_ECDSA_SIGN:
-      return l10n_util::GetStringUTF8(IDS_CLIENT_CERT_ECDSA_SIGN);
-    default:
-      return base::IntToString(type);
-  }
-}
-
 }  // namespace
 
 CookiesTreeModelUtil::CookiesTreeModelUtil() {
 }
 
 CookiesTreeModelUtil::~CookiesTreeModelUtil() {
 }
 
 std::string CookiesTreeModelUtil::GetTreeNodeId(const CookieTreeNode* node) {
   CookieTreeNodeMap::const_iterator iter = node_map_.find(node);
@@ skipping 157 matching lines @@
     }
     case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID: {
       dict->SetString(kKeyType, "channel_id");
       dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON");
 
       const net::ChannelIDStore::ChannelID& channel_id =
           *node.GetDetailedInfo().channel_id;
 
       dict->SetString(kKeyServerId, channel_id.server_identifier());
       dict->SetString(kKeyCertType,
-                      ClientCertTypeToString(net::CLIENT_CERT_ECDSA_SIGN));
+                      l10n_util::GetStringUTF8(IDS_CLIENT_CERT_ECDSA_SIGN));

[davidben, 2015/05/12 00:22:04]

Is there any reason to localize this? It's the string "ecdsa_sign".

[Ryan Sleevi, 2015/05/12 00:56:12]

No clue. I suspect maybe they wanted to say "Elliptic Curve" or something fancy,
but never got around to it. git blame & find an Android OWNER, but my gut is
it's safe to not localize.

[davidben, 2015/05/12 21:31:01]

Looks like it's got translateable="false" anyway, but mattm tells me the rule is
that UI strings should end up in grd files even if they're not localized, so
I'll leave it as-is I guess.

       dict->SetString(kKeyCreated, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(
               channel_id.creation_time())));
       break;
     }
     case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER: {
       dict->SetString(kKeyType, "service_worker");
       dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_STORAGE_ICON");
 
       const content::ServiceWorkerUsageInfo& service_worker_info =
@@ skipping 75 matching lines @@
     child = id_map_.Lookup(node_id);
     child_index = parent->GetIndexOf(child);
     if (child_index == -1)
       break;
 
     parent = child;
   }
 
   return child_index >= 0 ? child : NULL;
 }