Remove vestigial cookie/web app permissions prompting UI now that the async U...

chrome/browser/renderer_host/database_dispatcher_host.cc

 // Copyright (c) 2010 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/renderer_host/database_dispatcher_host.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/browser/renderer_host/database_permission_request.h"
 #include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "webkit/database/database_util.h"
 #include "webkit/database/vfs_backend.h"
 
 using WebKit::WebSecurityOrigin;
 using webkit_database::DatabaseTracker;
 using webkit_database::DatabaseUtil;
@@ skipping 354 matching lines @@
 
 void DatabaseDispatcherHost::OnAllowDatabase(const std::string& origin_url,
                                              const string16& name,
                                              const string16& display_name,
                                              unsigned long estimated_size,
                                              IPC::Message* reply_msg) {
   GURL url = GURL(origin_url);
   ContentSetting content_setting =
       host_content_settings_map_->GetContentSetting(
           url, CONTENT_SETTINGS_TYPE_COOKIES, "");
-  if (content_setting == CONTENT_SETTING_ASK) {
-    // Create a task for each possible outcome.
-    scoped_ptr<Task> on_allow(NewRunnableMethod(
-        this, &DatabaseDispatcherHost::AllowDatabaseResponse,
-        reply_msg, CONTENT_SETTING_ALLOW));
-    scoped_ptr<Task> on_block(NewRunnableMethod(
-        this, &DatabaseDispatcherHost::AllowDatabaseResponse,
-        reply_msg, CONTENT_SETTING_BLOCK));
-    // And then let the permission request object do the rest.
-    scoped_refptr<DatabasePermissionRequest> request(
-        new DatabasePermissionRequest(url, name, display_name, estimated_size,
-                                      on_allow.release(), on_block.release(),
-                                      host_content_settings_map_));
-    request->RequestPermission();
-
-    // Tell the renderer that it needs to run a nested message loop.
-    Send(new ViewMsg_SignalCookiePromptEvent());
-    return;
-  }
-
   AllowDatabaseResponse(reply_msg, content_setting);
 }
 
 void DatabaseDispatcherHost::AllowDatabaseResponse(
     IPC::Message* reply_msg, ContentSetting content_setting) {
   DCHECK((content_setting == CONTENT_SETTING_ALLOW) ||
          (content_setting == CONTENT_SETTING_BLOCK) ||
          (content_setting == CONTENT_SETTING_SESSION_ONLY));
   ViewHostMsg_AllowDatabase::WriteReplyParams(
       reply_msg, content_setting != CONTENT_SETTING_BLOCK);
@@ skipping 24 matching lines @@
                                         database_size, space_available));
   }
 }
 
 void DatabaseDispatcherHost::OnDatabaseScheduledForDeletion(
     const string16& origin_identifier,
     const string16& database_name) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   Send(new ViewMsg_DatabaseCloseImmediately(origin_identifier, database_name));
 }