Remove use of CanonicalCookie::Source() from browsing_data.

chrome/browser/browsing_data/cookies_tree_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_
 #define CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_
 
 // TODO(viettrungluu): This header file #includes far too much and has too much
 // inline code (which shouldn't be inline).
 
@@ skipping 668 matching lines @@
  private:
   std::string domain_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieTreeFlashLSONode);
 };
 
 // CookiesTreeModel -----------------------------------------------------------
 class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {
  public:
   CookiesTreeModel(LocalDataContainer* data_container,
-                   ExtensionSpecialStoragePolicy* special_storage_policy,
-                   bool group_by_cookie_source);
+                   ExtensionSpecialStoragePolicy* special_storage_policy);
   ~CookiesTreeModel() override;
 
   // Given a CanonicalCookie, return the ID of the message which should be
   // displayed in various ports' "Send for:" UI.
   static int GetSendForMessageID(const net::CanonicalCookie& cookie);
 
   // Because non-cookie nodes are fetched in a background thread, they are not
   // present at the time the Model is created. The Model then notifies its
   // observers for every item added from databases, local storage, and
   // appcache. We extend the Observer interface to add notifications before and
@@ skipping 141 matching lines @@
       ScopedBatchUpdateNotifier* notifier,
       const base::string16& filter);
   void PopulateCacheStorageUsageInfoWithFilter(
       LocalDataContainer* container,
       ScopedBatchUpdateNotifier* notifier,
       const base::string16& filter);
   void PopulateFlashLSOInfoWithFilter(LocalDataContainer* container,
                                       ScopedBatchUpdateNotifier* notifier,
                                       const base::string16& filter);
 
-  // Map of app ids to LocalDataContainer objects to use when retrieving
-  // locally stored data.
-  std::unique_ptr<LocalDataContainer> data_container_;
-
 #if defined(ENABLE_EXTENSIONS)
   // The extension special storage policy; see ExtensionsProtectingNode() above.
   scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
 #endif
 
+  // Map of app ids to LocalDataContainer objects to use when retrieving
+  // locally stored data.
+  std::unique_ptr<LocalDataContainer> data_container_;
+
   // The CookiesTreeModel maintains a separate list of observers that are
   // specifically of the type CookiesTreeModel::Observer.
   base::ObserverList<Observer> cookies_observer_list_;
 
-  // If true, use the CanonicalCookie::Source attribute to group cookies.
-  // Otherwise, use the CanonicalCookie::Domain attribute.
-  bool group_by_cookie_source_;
-
   // Keeps track of how many batches the consumer of this class says it is going
   // to send.
   int batches_expected_ = 0;
 
   // Keeps track of how many batches we've seen.
   int batches_seen_ = 0;
 
   // Counts how many batches have started already. If this is non-zero and lower
   // than batches_ended_, then this model is still batching updates.
   int batches_started_ = 0;
 
   // Counts how many batches have finished.
   int batches_ended_ = 0;
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_