Revert 39732 due to reliability bot failures.

Sometimes there is not a current context.

TBR=jochen
BUG=36600
TEST=none

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

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

3 files changed, 3 insertions, 24 deletions

diff --git a/chrome/browser/renderer_host/database_dispatcher_host.cc b/chrome/browser/renderer_host/database_dispatcher_host.cc
index 270e3f9..e7734ac 100644
--- a/chrome/browser/renderer_host/database_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/database_dispatcher_host.cc
@@ -181,15 +181,13 @@ void DatabaseDispatcherHost::OnDatabaseOpenFile(const string16& vfs_file_name,
 static void SetOpenFileResponseParams(
     ViewMsg_DatabaseOpenFileResponse_Params* params,
     base::PlatformFile file_handle,
-    base::PlatformFile dir_handle,
-    bool is_blocked) {
+    base::PlatformFile dir_handle) {
 #if defined(OS_WIN)
   params->file_handle = file_handle;
 #elif defined(OS_POSIX)
   params->file_handle = base::FileDescriptor(file_handle, true);
   params->dir_handle = base::FileDescriptor(dir_handle, true);
 #endif
-  params->blocked = is_blocked;
 }
 
 // Scheduled by the IO thread on the file thread.
@@ -221,8 +219,7 @@ void DatabaseDispatcherHost::DatabaseOpenFile(const string16& vfs_file_name,
   }
 
   ViewMsg_DatabaseOpenFileResponse_Params response_params;
-  SetOpenFileResponseParams(&response_params, target_handle, target_dir_handle,
-      false /* blocked */);
+  SetOpenFileResponseParams(&response_params, target_handle, target_dir_handle);
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(this,
@@ -479,8 +476,7 @@ void DatabaseDispatcherHost::OnDatabaseOpenFileBlocked(int32 message_id) {
   ViewMsg_DatabaseOpenFileResponse_Params response_params;
   SetOpenFileResponseParams(&response_params,
                             base::kInvalidPlatformFileValue,
-                            base::kInvalidPlatformFileValue,
-                            true /* blocked */);
+                            base::kInvalidPlatformFileValue);
   SendMessage(new ViewMsg_DatabaseOpenFileResponse(message_id,
                                                    response_params));
 }
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index ae5e7ba..7e05039 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -407,7 +407,6 @@ struct ViewMsg_DatabaseOpenFileResponse_Params {
 #if defined(OS_POSIX)
   base::FileDescriptor dir_handle;    // DB directory handle
 #endif
-  bool blocked;    // DB access was blocked.
 };
 
 // Parameters to describe a rendered page.
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 62586b5..9b7327d 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -350,22 +350,6 @@ WebKitClient::FileHandle RendererWebKitClientImpl::databaseOpenFile(
               vfs_file_name, desired_flags, message_id),
           message_id, default_response);
 
-  if (result.blocked) {
-    // RoutingIDForCurrentContext scans the render thread's stack for a
-    // ScriptExecutionContext. However, we are running on the database thread.
-    // The reason why this works is that the render thread blocks in
-    // third_party/WebKit/WebCore/storage/Database.cpp:openAndVerifyVersion,
-    // and therefore, the latest ScriptExecutionContext on the render thread
-    // is the context in which this database open was requested.
-    //
-    // TODO(jochen): either obtain the routing ID in a less fragile way or
-    // figure out a way to pass the content blocked message to the caller.
-    int32 routing_id = RenderThread::RoutingIDForCurrentContext();
-    CHECK(routing_id != MSG_ROUTING_CONTROL);
-    db_message_filter->Send(new ViewHostMsg_ContentBlocked(
-        routing_id, CONTENT_SETTINGS_TYPE_COOKIES));
-  }
-
 #if defined(OS_WIN)
   if (dir_handle) {
     *dir_handle = base::kInvalidPlatformFileValue;