Revert last 3 patches. Sorry guys. :-(

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

1 files changed, 10 insertions, 91 deletions

diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h
index 45c7585..11b7f8a 100644
--- a/chrome/browser/cookies_tree_model.h
+++ b/chrome/browser/cookies_tree_model.h
@@ -10,12 +10,9 @@
 
 #include "app/tree_node_model.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "net/base/cookie_monster.h"
 
 class CookiesTreeModel;
-class CookieTreeLocalStorageNode;
-class CookieTreeLocalStoragesNode;
 class CookieTreeCookieNode;
 class CookieTreeCookiesNode;
 class CookieTreeOriginNode;
@@ -36,27 +33,18 @@ class CookieTreeNode : public TreeNode<CookieTreeNode> {
       TYPE_ROOT,  // This is used for CookieTreeRootNode nodes.
       TYPE_ORIGIN,  // This is used for CookieTreeOriginNode nodes.
       TYPE_COOKIES,  // This is used for CookieTreeCookiesNode nodes.
-      TYPE_COOKIE,  // This is used for CookieTreeCookieNode nodes.
-      TYPE_LOCAL_STORAGES,  // This is used for CookieTreeLocalStoragesNode.
-      TYPE_LOCAL_STORAGE,  // This is used for CookieTreeLocalStorageNode.
+      TYPE_COOKIE  // This is used for CookieTreeCookieNode nodes.
     };
 
     DetailedInfo(const std::wstring& origin, NodeType node_type,
-        const net::CookieMonster::CookieListPair* cookie,
-        const BrowsingDataLocalStorageHelper::LocalStorageInfo*
-            local_storage_info)
+        const net::CookieMonster::CookieListPair* cookie)
         : origin(origin),
           node_type(node_type),
-          cookie(cookie),
-          local_storage_info(local_storage_info) {
-      if (node_type == TYPE_LOCAL_STORAGE)
-        DCHECK(local_storage_info);
-    }
+          cookie(cookie) {}
 
     std::wstring origin;
     NodeType node_type;
     const net::CookieMonster::CookieListPair* cookie;
-    const BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info;
   };
 
   CookieTreeNode() {}
@@ -91,7 +79,7 @@ class CookieTreeRootNode : public CookieTreeNode {
   // CookieTreeNode methods:
   virtual CookiesTreeModel* GetModel() const { return model_; }
   virtual DetailedInfo GetDetailedInfo() const {
-    return DetailedInfo(std::wstring(), DetailedInfo::TYPE_ROOT, NULL, NULL);
+    return DetailedInfo(std::wstring(), DetailedInfo::TYPE_ROOT, NULL);
   }
  private:
 
@@ -104,19 +92,16 @@ class CookieTreeRootNode : public CookieTreeNode {
 class CookieTreeOriginNode : public CookieTreeNode {
  public:
   explicit CookieTreeOriginNode(const std::wstring& origin)
-      : CookieTreeNode(origin), cookies_child_(NULL),
-        local_storages_child_(NULL) {}
+      : CookieTreeNode(origin), cookies_child_(NULL) {}
   virtual ~CookieTreeOriginNode() {}
 
   // CookieTreeNode methods:
   virtual DetailedInfo GetDetailedInfo() const {
-    return DetailedInfo(GetTitle(), DetailedInfo::TYPE_ORIGIN, NULL, NULL);
+    return DetailedInfo(GetTitle(), DetailedInfo::TYPE_ORIGIN, NULL);
   }
 
   // CookieTreeOriginNode methods:
   CookieTreeCookiesNode* GetOrCreateCookiesNode();
-  CookieTreeLocalStoragesNode* GetOrCreateLocalStoragesNode();
-
  private:
 
   // A pointer to the COOKIES node. Eventually we will also have database,
@@ -126,7 +111,6 @@ class CookieTreeOriginNode : public CookieTreeNode {
   // DATABASES etc node seems less preferable than storing an extra pointer per
   // origin.
   CookieTreeCookiesNode* cookies_child_;
-  CookieTreeLocalStoragesNode* local_storages_child_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieTreeOriginNode);
 };
@@ -140,7 +124,7 @@ class CookieTreeCookiesNode : public CookieTreeNode {
   // CookieTreeNode methods:
   virtual DetailedInfo GetDetailedInfo() const {
     return DetailedInfo(GetParent()->GetTitle(), DetailedInfo::TYPE_COOKIES,
-                        NULL, NULL);
+                        NULL);
   }
 
   // CookieTreeCookiesNode methods:
@@ -163,7 +147,7 @@ class CookieTreeCookieNode : public CookieTreeNode {
   virtual void DeleteStoredObjects();
   virtual DetailedInfo GetDetailedInfo() const {
     return DetailedInfo(GetParent()->GetParent()->GetTitle(),
-                        DetailedInfo::TYPE_COOKIE, cookie_, NULL);
+                        DetailedInfo::TYPE_COOKIE, cookie_);
   }
 
  private:
@@ -181,64 +165,11 @@ class CookieTreeCookieNode : public CookieTreeNode {
   DISALLOW_COPY_AND_ASSIGN(CookieTreeCookieNode);
 };
 
-// CookieTreeLocalStoragesNode -------------------------------------------------
-class CookieTreeLocalStoragesNode : public CookieTreeNode {
- public:
-  CookieTreeLocalStoragesNode();
-  virtual ~CookieTreeLocalStoragesNode() {}
-
-  // CookieTreeNode methods:
-  virtual DetailedInfo GetDetailedInfo() const {
-    return DetailedInfo(GetParent()->GetTitle(),
-                        DetailedInfo::TYPE_LOCAL_STORAGES,
-                        NULL,
-                        NULL);
-  }
-
-  // CookieTreeStoragesNode methods:
-  void AddLocalStorageNode(CookieTreeLocalStorageNode* child);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CookieTreeLocalStoragesNode);
-};
-
-class CookieTreeLocalStorageNode : public CookieTreeNode {
- public:
-  friend class CookieTreeLocalStoragesNode;
-
-  // Does not take ownership of local_storage_info, and local_storage_info
-  // should remain valid at least as long as the CookieTreeStorageNode is valid.
-  explicit CookieTreeLocalStorageNode(
-      BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info);
-  virtual ~CookieTreeLocalStorageNode() {}
-
-  // CookieTreeStorageNode methods:
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const {
-    return DetailedInfo(GetParent()->GetParent()->GetTitle(),
-                        DetailedInfo::TYPE_LOCAL_STORAGE, NULL,
-                        local_storage_info_);
-  }
-
- private:
-  // Comparator functor, takes CookieTreeNode so that we can use it in
-  // lower_bound using children()'s iterators, which are CookieTreeNode*.
-  class CookieNodeComparator {
-   public:
-    bool operator() (const CookieTreeNode* lhs, const CookieTreeNode* rhs);
-  };
-
-  // local_storage_info_ is not owned by the node, and is expected to remain
-  // valid as long as the CookieTreeLocalStorageNode is valid.
-  BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info_;
-
-  DISALLOW_COPY_AND_ASSIGN(CookieTreeLocalStorageNode);
-};
 
 class CookiesTreeModel : public TreeNodeModel<CookieTreeNode> {
  public:
   explicit CookiesTreeModel(Profile* profile);
-  virtual ~CookiesTreeModel();
+  virtual ~CookiesTreeModel() {}
 
   // TreeModel methods:
   // Returns the set of icons for the nodes in the tree. You only need override
@@ -254,8 +185,6 @@ class CookiesTreeModel : public TreeNodeModel<CookieTreeNode> {
   void DeleteCookie(const net::CookieMonster::CookieListPair& cookie);
   void DeleteAllCookies();
   void DeleteCookieNode(CookieTreeNode* cookie_node);
-  void DeleteLocalStorage(const FilePath& file_path);
-  void DeleteAllLocalStorage();
 
   // Filter the origins to only display matched results.
   void UpdateSearchResults(const std::wstring& filter);
@@ -263,28 +192,18 @@ class CookiesTreeModel : public TreeNodeModel<CookieTreeNode> {
  private:
   enum CookieIconIndex {
     ORIGIN = 0,
-    COOKIE = 1,
-    LOCAL_STORAGE = 2,
+    COOKIE = 1
   };
   typedef net::CookieMonster::CookieList CookieList;
   typedef std::vector<net::CookieMonster::CookieListPair*> CookiePtrList;
-  typedef std::vector<BrowsingDataLocalStorageHelper::LocalStorageInfo>
-      LocalStorageInfoList;
 
   void LoadCookies();
   void LoadCookiesWithFilter(const std::wstring& filter);
 
-  void OnStorageModelInfoLoaded(const LocalStorageInfoList& local_storage_info);
-
-  void PopulateLocalStorageInfoWithFilter(const std::wstring& filter);
-
   // The profile from which this model sources cookies.
   Profile* profile_;
   CookieList all_cookies_;
 
-  scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_model_;
-  LocalStorageInfoList local_storage_info_list_;
-
   DISALLOW_COPY_AND_ASSIGN(CookiesTreeModel);
 };