Revert 43183 - Block database access on allowDatabase instead of databaseOpenFile.

BUG=36435
TEST=Set cookie settings to ASK and open a page with web databases.

Review URL: http://codereview.chromium.org/1338001

TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/1595003

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

1 files changed, 6 insertions, 15 deletions

diff --git a/chrome/browser/renderer_host/database_dispatcher_host.h b/chrome/browser/renderer_host/database_dispatcher_host.h
index 251bc5b..4c16d06 100644
--- a/chrome/browser/renderer_host/database_dispatcher_host.h
+++ b/chrome/browser/renderer_host/database_dispatcher_host.h
@@ -14,9 +14,6 @@
 #include "webkit/database/database_connections.h"
 #include "webkit/database/database_tracker.h"
 
-class GURL;
-class HostContentSettingsMap;
-class Receiver;
 class ResourceMessageFilter;
 
 class DatabaseDispatcherHost
@@ -51,11 +48,6 @@ class DatabaseDispatcherHost
                           const string16& database_name);
   void OnDatabaseClosed(const string16& origin_identifier,
                         const string16& database_name);
-  void OnAllowDatabase(const std::string& origin_url,
-                       const string16& name,
-                       const string16& display_name,
-                       unsigned long estimated_size,
-                       IPC::Message* reply_msg);
 
   // DatabaseTracker::Observer callbacks (file thread)
   virtual void OnDatabaseSizeChanged(const string16& origin_identifier,
@@ -65,15 +57,12 @@ class DatabaseDispatcherHost
   virtual void OnDatabaseScheduledForDeletion(const string16& origin_identifier,
                                               const string16& database_name);
 
-  void Send(IPC::Message* message);
-
  private:
-  class PromptDelegate;
-
   void AddObserver();
   void RemoveObserver();
 
   void ReceivedBadMessage(uint32 msg_type);
+  void SendMessage(IPC::Message* message);
 
   // VFS message handlers (file thread)
   void DatabaseOpenFile(const string16& vfs_file_name,
@@ -98,9 +87,11 @@ class DatabaseDispatcherHost
   void DatabaseClosed(const string16& origin_identifier,
                       const string16& database_name);
 
-  // CookiePromptModalDialog response handler (io thread)
-  void AllowDatabaseResponse(IPC::Message* reply_msg,
-                             ContentSetting content_setting);
+  // Called once we decide whether to allow or block an open file request.
+  void OnDatabaseOpenFileAllowed(const string16& vfs_file_name,
+                                 int desired_flags,
+                                 int32 message_id);
+  void OnDatabaseOpenFileBlocked(int32 message_id);
 
   // The database tracker for the current profile.
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;