Port BrowsingDataDatabaseHelper to webkit_database::DatabaseIdentifier

chrome/browser/browsing_data/browsing_data_database_helper.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_BROWSING_DATA_DATABASE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
 
 #include <list>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/browser/database/database_tracker.h"
+#include "webkit/common/database/database_identifier.h"
 
 class Profile;
 
 // This class fetches database information in the FILE thread, and notifies
 // the UI thread upon completion.
 // A client of this class need to call StartFetching from the UI thread to
 // initiate the flow, and it'll be notified by the callback in its UI
 // thread at some later point.
 class BrowsingDataDatabaseHelper
     : public base::RefCountedThreadSafe<BrowsingDataDatabaseHelper> {
  public:
   // Contains detailed information about a web database.
   struct DatabaseInfo {
-    DatabaseInfo(const std::string& host,
+    DatabaseInfo(const webkit_database::DatabaseIdentifier& identifier,
                  const std::string& database_name,
-                 const std::string& origin_identifier,
                  const std::string& description,
-                 const std::string& origin,
                  int64 size,
                  base::Time last_modified);
     ~DatabaseInfo();
 
-    std::string host;
+    webkit_database::DatabaseIdentifier identifier;
     std::string database_name;
-    std::string origin_identifier;
     std::string description;
-    std::string origin;
     int64 size;
     base::Time last_modified;
   };
 
   explicit BrowsingDataDatabaseHelper(Profile* profile);
 
   // Starts the fetching process, which will notify its completion via
   // callback.
   // This must be called only in the UI thread.
   virtual void StartFetching(
       const base::Callback<void(const std::list<DatabaseInfo>&)>& callback);
 
   // Requests a single database to be deleted in the FILE thread. This must be
   // called in the UI thread.
-  virtual void DeleteDatabase(const std::string& origin,
+  virtual void DeleteDatabase(const std::string& origin_identifier,
                               const std::string& name);
 
  protected:
   friend class base::RefCountedThreadSafe<BrowsingDataDatabaseHelper>;
   virtual ~BrowsingDataDatabaseHelper();
 
   // Notifies the completion callback. This must be called in the UI thread.
   void NotifyInUIThread();
 
   // Access to |database_info_| is triggered indirectly via the UI thread and
@@ skipping 71 matching lines @@
   const std::set<PendingDatabaseInfo>& GetPendingDatabaseInfo();
 
   // BrowsingDataDatabaseHelper implementation.
   virtual void StartFetching(
       const base::Callback<void(const std::list<DatabaseInfo>&)>& callback)
           OVERRIDE;
 
  private:
   virtual ~CannedBrowsingDataDatabaseHelper();
 
-  // Converts the pending database info structs to database info structs.
-  void ConvertInfoInWebKitThread();
-
-  // Used to protect access to pending_database_info_.
-  mutable base::Lock lock_;
-
-  // Access to |pending_database_info_| is protected by |lock_| since it may
-  // be accessed on the UI or the WEBKIT thread.
   std::set<PendingDatabaseInfo> pending_database_info_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataDatabaseHelper);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_