Cleanup and optimizing switch using fall through.

chrome/browser/browsing_data/cookies_tree_model.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/browsing_data/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <vector>
@@ skipping 117 matching lines @@
     replacements.SetScheme("http", url::Component(0, 4));
 
   return url.GetOrigin().ReplaceComponents(replacements);
 }
 
 #if defined(ENABLE_EXTENSIONS)
 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:
       return false;
     default:
       break;
   }
   return false;
 }
 #endif
@@ skipping 128 matching lines @@
 
 void CookieTreeNode::DeleteStoredObjects() {
   std::for_each(children().begin(),
                 children().end(),
                 std::mem_fun(&CookieTreeNode::DeleteStoredObjects));
 }
 
 CookiesTreeModel* CookieTreeNode::GetModel() const {
   if (parent())
     return parent()->GetModel();
-  else
-    return nullptr;
+  return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieTreeCookieNode, public:
 
 CookieTreeCookieNode::CookieTreeCookieNode(
     std::list<net::CanonicalCookie>::iterator cookie)
     : CookieTreeNode(base::UTF8ToUTF16(cookie->Name())),
       cookie_(cookie) {
 }
@@ skipping 710 matching lines @@
 // Returns the index of the icon to use for |node|. Return -1 to use the
 // default icon. The index is relative to the list of icons returned from
 // GetIcons.
 int CookiesTreeModel::GetIconIndex(ui::TreeModelNode* node) {
   CookieTreeNode* ct_node = static_cast<CookieTreeNode*>(node);
   switch (ct_node->GetDetailedInfo().node_type) {
     case CookieTreeNode::DetailedInfo::TYPE_HOST:
       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:
+    case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER:  // fall through
+    case CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE:
       return DATABASE;  // Just like appcache
-    case CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE:
-      return DATABASE;  // ditto
     default:
       break;
   }
   return -1;
 }
 
 void CookiesTreeModel::DeleteAllStoredObjects() {
   NotifyObserverBeginBatch();
   CookieTreeNode* root = GetRoot();
   root->DeleteStoredObjects();
@@ skipping 489 matching lines @@
 void CookiesTreeModel::MaybeNotifyBatchesEnded() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (batches_ended_ == batches_started_ &&
       batches_seen_ == batches_expected_) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
   }
 }