Cleanup and optimizing switch using fall through.

chrome/browser/browsing_data/cookies_tree_model.cc

Index: chrome/browser/browsing_data/cookies_tree_model.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 9538a02953985df6384bf1fc0fc6eb435293c3c8..7361fdd0ffcb1c4742db5272a5110ce557cb77ad 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -135,24 +135,17 @@ bool TypeIsProtected(CookieTreeNode::DetailedInfo::NodeType type) {
   switch (type) {
     case CookieTreeNode::DetailedInfo::TYPE_COOKIE:
       return false;
-    case CookieTreeNode::DetailedInfo::TYPE_DATABASE:
-      return true;
-    case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE:
-      return true;
-    case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE:
-      return true;
-    case CookieTreeNode::DetailedInfo::TYPE_APPCACHE:
-      return true;
-    case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB:
-      return true;
+    case CookieTreeNode::DetailedInfo::TYPE_DATABASE:  // fall through

[Bernhard Bauer, 2015/10/19 13:17:54]

Same as below: Let's replace these comments with a single comment before the
block, and group them by type rather than by their numeric value.

[Deepak, 2015/10/19 14:27:37]

Done.

+    case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_APPCACHE:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB:  // fall through
     case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM:
       return true;
-    case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
-      return false;
+    case CookieTreeNode::DetailedInfo::TYPE_QUOTA:  // fall through
     case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID:
       return false;
-    case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER:
-      return true;
+    case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER:  // fall through
     case CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE:
       return true;
     case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO:
@@ -301,8 +294,7 @@ void CookieTreeNode::DeleteStoredObjects() {
 CookiesTreeModel* CookieTreeNode::GetModel() const {
   if (parent())
     return parent()->GetModel();
-  else
-    return nullptr;
+  return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1033,26 +1025,20 @@ int CookiesTreeModel::GetIconIndex(ui::TreeModelNode* node) {
       return ORIGIN;
     case CookieTreeNode::DetailedInfo::TYPE_COOKIE:
       return COOKIE;
-    case CookieTreeNode::DetailedInfo::TYPE_DATABASE:
-      return DATABASE;
-    case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE:
+    case CookieTreeNode::DetailedInfo::TYPE_DATABASE:  // fall through

[Bernhard Bauer, 2015/10/19 13:17:54]

Let's remove these comments; maybe add one before this block that says that we
fall through for each type below.

[Deepak, 2015/10/19 14:27:37]

Done.

+    case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_APPCACHE:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM:  // fall through
       return DATABASE;  // close enough
-    case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE:
-      return DATABASE;  // ditto
-    case CookieTreeNode::DetailedInfo::TYPE_APPCACHE:
-      return DATABASE;  // ditto
-    case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB:
-      return DATABASE;  // ditto
-    case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM:
-      return DATABASE;  // ditto
     case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
       return -1;
     case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID:

[Bernhard Bauer, 2015/10/19 13:17:54]

Can we group this together with the COOKIE one above, and the DATABASE ones
below with the ones above?

[Deepak, 2015/10/19 14:27:37]

Done.

       return COOKIE;  // It's kinda like a cookie?
-    case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER:
-      return DATABASE;  // Just like appcache
+    case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER:  // fall through
     case CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE:
-      return DATABASE;  // ditto
+      return DATABASE;  // Just like appcache
     default:
       break;
   }