Refactor CookieTreeNode::DetailedInfo initialization. Remove wstrings.

BUG=121863
TEST=trybots

Review URL: https://chromiumcodereview.appspot.com/9968102

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130789 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 103 insertions, 118 deletions

diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index 211f110..f960744 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -61,9 +61,7 @@ void CookieTreeCookieNode::DeleteStoredObjects() {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeCookieNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_COOKIE,
-                      &*cookie_, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitCookie(&*cookie_);
 }
 
 namespace {
@@ -147,10 +145,8 @@ void CookieTreeAppCacheNode::DeleteStoredObjects() {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeAppCacheNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_APPCACHE,
-                      NULL, NULL, NULL, NULL, &*appcache_info_,
-                      NULL, NULL, NULL);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitAppCache(
+      &*appcache_info_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -173,10 +169,8 @@ void CookieTreeDatabaseNode::DeleteStoredObjects() {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeDatabaseNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_DATABASE,
-                      NULL, &*database_info_,
-                      NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitDatabase(
+      &*database_info_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -202,10 +196,8 @@ void CookieTreeLocalStorageNode::DeleteStoredObjects() {
 
 CookieTreeNode::DetailedInfo
 CookieTreeLocalStorageNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_LOCAL_STORAGE,
-                      NULL, NULL, &*local_storage_info_, NULL, NULL, NULL, NULL,
-                      NULL);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitLocalStorage(
+      &*local_storage_info_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -229,10 +221,8 @@ void CookieTreeSessionStorageNode::DeleteStoredObjects() {
 
 CookieTreeNode::DetailedInfo
 CookieTreeSessionStorageNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_SESSION_STORAGE,
-                      NULL, NULL, NULL, &*session_storage_info_, NULL, NULL,
-                      NULL, NULL);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitSessionStorage(
+      &*session_storage_info_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -255,10 +245,8 @@ void CookieTreeIndexedDBNode::DeleteStoredObjects() {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeIndexedDBNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_INDEXED_DB,
-                      NULL, NULL, NULL, NULL, NULL, &*indexed_db_info_, NULL,
-                      NULL);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitIndexedDB(
+      &*indexed_db_info_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -281,10 +269,8 @@ void CookieTreeFileSystemNode::DeleteStoredObjects() {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeFileSystemNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_FILE_SYSTEM,
-                      NULL, NULL, NULL, NULL, NULL, NULL, &*file_system_info_,
-                      NULL);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitFileSystem(
+      &*file_system_info_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -306,9 +292,8 @@ void CookieTreeQuotaNode::DeleteStoredObjects() {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeQuotaNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->parent()->GetTitle(),
-                      DetailedInfo::TYPE_QUOTA,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, &*quota_info_);
+  return DetailedInfo(parent()->parent()->GetTitle()).InitQuota(
+      &*quota_info_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -348,9 +333,7 @@ CookiesTreeModel* CookieTreeRootNode::GetModel() const {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
-  return DetailedInfo(string16(),
-                      DetailedInfo::TYPE_ROOT,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(string16()).Init(DetailedInfo::TYPE_ROOT);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -377,9 +360,7 @@ CookieTreeOriginNode::CookieTreeOriginNode(const GURL& url)
 CookieTreeOriginNode::~CookieTreeOriginNode() {}
 
 CookieTreeNode::DetailedInfo CookieTreeOriginNode::GetDetailedInfo() const {
-  return DetailedInfo(GetTitle(),
-                      DetailedInfo::TYPE_ORIGIN,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(GetTitle()).Init(DetailedInfo::TYPE_ORIGIN);
 }
 
 CookieTreeCookiesNode* CookieTreeOriginNode::GetOrCreateCookiesNode() {
@@ -479,9 +460,7 @@ CookieTreeCookiesNode::~CookieTreeCookiesNode() {
 }
 
 CookieTreeNode::DetailedInfo CookieTreeCookiesNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->GetTitle(),
-                      DetailedInfo::TYPE_COOKIES,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->GetTitle()).Init(DetailedInfo::TYPE_COOKIES);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -495,9 +474,7 @@ CookieTreeAppCachesNode::CookieTreeAppCachesNode()
 CookieTreeAppCachesNode::~CookieTreeAppCachesNode() {}
 
 CookieTreeNode::DetailedInfo CookieTreeAppCachesNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->GetTitle(),
-                      DetailedInfo::TYPE_APPCACHES,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->GetTitle()).Init(DetailedInfo::TYPE_APPCACHES);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -510,9 +487,7 @@ CookieTreeDatabasesNode::CookieTreeDatabasesNode()
 CookieTreeDatabasesNode::~CookieTreeDatabasesNode() {}
 
 CookieTreeNode::DetailedInfo CookieTreeDatabasesNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->GetTitle(),
-                      DetailedInfo::TYPE_DATABASES,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->GetTitle()).Init(DetailedInfo::TYPE_DATABASES);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -526,9 +501,8 @@ CookieTreeLocalStoragesNode::~CookieTreeLocalStoragesNode() {}
 
 CookieTreeNode::DetailedInfo
 CookieTreeLocalStoragesNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->GetTitle(),
-                      DetailedInfo::TYPE_LOCAL_STORAGES,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->GetTitle()).Init(
+      DetailedInfo::TYPE_LOCAL_STORAGES);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -542,9 +516,8 @@ CookieTreeSessionStoragesNode::~CookieTreeSessionStoragesNode() {}
 
 CookieTreeNode::DetailedInfo
 CookieTreeSessionStoragesNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->GetTitle(),
-                      DetailedInfo::TYPE_SESSION_STORAGES,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->GetTitle()).Init(
+      DetailedInfo::TYPE_SESSION_STORAGES);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -558,9 +531,8 @@ CookieTreeIndexedDBsNode::~CookieTreeIndexedDBsNode() {}
 
 CookieTreeNode::DetailedInfo
 CookieTreeIndexedDBsNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->GetTitle(),
-                      DetailedInfo::TYPE_INDEXED_DBS,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->GetTitle()).Init(
+      DetailedInfo::TYPE_INDEXED_DBS);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -574,9 +546,8 @@ CookieTreeFileSystemsNode::~CookieTreeFileSystemsNode() {}
 
 CookieTreeNode::DetailedInfo
 CookieTreeFileSystemsNode::GetDetailedInfo() const {
-  return DetailedInfo(parent()->GetTitle(),
-                      DetailedInfo::TYPE_FILE_SYSTEMS,
-                      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  return DetailedInfo(parent()->GetTitle()).Init(
+      DetailedInfo::TYPE_FILE_SYSTEMS);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h
index 4ed0462..ee2cb55 100644
--- a/chrome/browser/cookies_tree_model.h
+++ b/chrome/browser/cookies_tree_model.h
@@ -60,6 +60,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {
   struct DetailedInfo {
     // NodeType corresponds to the various CookieTreeNode types.
     enum NodeType {
+      TYPE_NONE,
       TYPE_ROOT,  // This is used for CookieTreeRootNode nodes.
       TYPE_ORIGIN,  // This is used for CookieTreeOriginNode nodes.
       TYPE_COOKIES,  // This is used for CookieTreeCookiesNode nodes.
@@ -80,70 +81,83 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {
     };
 
     // TODO(viettrungluu): Figure out whether we want to store |origin| as a
-    // |string16| or a (UTF-8) |std::string|, and convert. Remove constructor
-    // taking an |std::wstring|.
-    DetailedInfo(const string16& origin, NodeType node_type,
-        const net::CookieMonster::CanonicalCookie* cookie,
-        const BrowsingDataDatabaseHelper::DatabaseInfo* database_info,
-        const BrowsingDataLocalStorageHelper::LocalStorageInfo*
-            local_storage_info,
-        const BrowsingDataLocalStorageHelper::LocalStorageInfo*
-            session_storage_info,
-        const appcache::AppCacheInfo* appcache_info,
-        const BrowsingDataIndexedDBHelper::IndexedDBInfo* indexed_db_info,
-        const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info,
-        const BrowsingDataQuotaHelper::QuotaInfo* quota_info)
-        : origin(UTF16ToWideHack(origin)),
-          node_type(node_type),
-          cookie(cookie),
-          database_info(database_info),
-          local_storage_info(local_storage_info),
-          session_storage_info(session_storage_info),
-          appcache_info(appcache_info),
-          indexed_db_info(indexed_db_info),
-          file_system_info(file_system_info),
-          quota_info(quota_info) {
-      DCHECK((node_type != TYPE_DATABASE) || database_info);
-      DCHECK((node_type != TYPE_LOCAL_STORAGE) || local_storage_info);
-      DCHECK((node_type != TYPE_SESSION_STORAGE) || session_storage_info);
-      DCHECK((node_type != TYPE_APPCACHE) || appcache_info);
-      DCHECK((node_type != TYPE_INDEXED_DB) || indexed_db_info);
-      DCHECK((node_type != TYPE_FILE_SYSTEM) || file_system_info);
-      DCHECK((node_type != TYPE_QUOTA) || quota_info);
+    // |string16| or a (UTF-8) |std::string|, and convert.
+    explicit DetailedInfo(const string16& origin)
+        : origin(origin),
+          node_type(TYPE_NONE),
+          cookie(NULL),
+          database_info(NULL),
+          local_storage_info(NULL),
+          session_storage_info(NULL),
+          appcache_info(NULL),
+          indexed_db_info(NULL),
+          file_system_info(NULL),
+          quota_info(NULL) {}
+
+    DetailedInfo& Init(NodeType type) {
+      DCHECK_EQ(TYPE_NONE, node_type);
+      node_type = type;
+      return *this;
+    }
+
+    DetailedInfo& InitCookie(
+        const net::CookieMonster::CanonicalCookie* cookie) {
+      Init(TYPE_COOKIE);
+      this->cookie = cookie;
+      return *this;
     }
-#if !defined(WCHAR_T_IS_UTF16)
-    DetailedInfo(const std::wstring& origin, NodeType node_type,
-        const net::CookieMonster::CanonicalCookie* cookie,
-        const BrowsingDataDatabaseHelper::DatabaseInfo* database_info,
+
+    DetailedInfo& InitDatabase(
+        const BrowsingDataDatabaseHelper::DatabaseInfo* database_info) {
+      Init(TYPE_DATABASE);
+      this->database_info = database_info;
+      return *this;
+    }
+
+    DetailedInfo& InitLocalStorage(
         const BrowsingDataLocalStorageHelper::LocalStorageInfo*
-            local_storage_info,
+        local_storage_info) {
+      Init(TYPE_LOCAL_STORAGE);
+      this->local_storage_info = local_storage_info;
+      return *this;
+    }
+
+    DetailedInfo& InitSessionStorage(
         const BrowsingDataLocalStorageHelper::LocalStorageInfo*
-            session_storage_info,
-        const appcache::AppCacheInfo* appcache_info,
-        const BrowsingDataIndexedDBHelper::IndexedDBInfo* indexed_db_info,
-        const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info,
-        const BrowsingDataQuotaHelper::QuotaInfo* quota_info)
-        : origin(origin),
-          node_type(node_type),
-          cookie(cookie),
-          database_info(database_info),
-          local_storage_info(local_storage_info),
-          session_storage_info(session_storage_info),
-          appcache_info(appcache_info),
-          indexed_db_info(indexed_db_info),
-          file_system_info(file_system_info),
-          quota_info(quota_info) {
-      DCHECK((node_type != TYPE_DATABASE) || database_info);
-      DCHECK((node_type != TYPE_LOCAL_STORAGE) || local_storage_info);
-      DCHECK((node_type != TYPE_SESSION_STORAGE) || session_storage_info);
-      DCHECK((node_type != TYPE_APPCACHE) || appcache_info);
-      DCHECK((node_type != TYPE_INDEXED_DB) || indexed_db_info);
-      DCHECK((node_type != TYPE_FILE_SYSTEM) || file_system_info);
-      DCHECK((node_type != TYPE_QUOTA) || quota_info);
+        session_storage_info) {
+      Init(TYPE_SESSION_STORAGE);
+      this->session_storage_info = session_storage_info;
+      return *this;
+    }
+
+    DetailedInfo& InitAppCache(const appcache::AppCacheInfo* appcache_info) {
+      Init(TYPE_APPCACHE);
+      this->appcache_info = appcache_info;
+      return *this;
+    }
+
+    DetailedInfo& InitIndexedDB(
+        const BrowsingDataIndexedDBHelper::IndexedDBInfo* indexed_db_info) {
+      Init(TYPE_INDEXED_DB);
+      this->indexed_db_info = indexed_db_info;
+      return *this;
+    }
+
+    DetailedInfo& InitFileSystem(
+        const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info) {
+      Init(TYPE_FILE_SYSTEM);
+      this->file_system_info = file_system_info;
+      return *this;
+    }
+
+    DetailedInfo& InitQuota(
+        const BrowsingDataQuotaHelper::QuotaInfo* quota_info) {
+      Init(TYPE_QUOTA);
+      this->quota_info = quota_info;
+      return *this;
     }
-#endif
 
-    std::wstring origin;
+    string16 origin;
     NodeType node_type;
     const net::CookieMonster::CanonicalCookie* cookie;
     const BrowsingDataDatabaseHelper::DatabaseInfo* database_info;
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
index e7fc214..ffc8837 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -260,7 +260,7 @@
   NSString* origin;
   switch (nodeType) {
     case CookieTreeNode::DetailedInfo::TYPE_COOKIE:
-      origin = base::SysWideToNSString(info.origin.c_str());
+      origin = base::SysUTF16ToNSString(info.origin.c_str());
       return [[[CocoaCookieDetails alloc] initWithCookie:info.cookie
                                                   origin:origin
                                        canEditExpiration:NO] autorelease];