Dispatch geolocation IPCs on the UI thread. Aside from simplifying the code to avoid a lot of threa…

android_webview/native/aw_contents.cc

 // Copyright 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.
 
 #include "android_webview/native/aw_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 117 matching lines @@
   int render_process_id = rfh->GetProcess()->GetID();
   int render_frame_id = rfh->GetRoutingID();
   AwResourceDispatcherHostDelegate::OnIoThreadClientReady(
       render_process_id, render_frame_id);
 }
 
 }  // namespace
 
 // static
 AwContents* AwContents::FromWebContents(WebContents* web_contents) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return AwContentsUserData::GetContents(web_contents);
 }
 
 // static
 AwContents* AwContents::FromID(int render_process_id, int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const content::RenderViewHost* rvh =
       content::RenderViewHost::FromID(render_process_id, render_view_id);
   if (!rvh) return NULL;
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
   if (!web_contents) return NULL;
   return FromWebContents(web_contents);
 }
 
 AwContents::AwContents(scoped_ptr<WebContents> web_contents)
@@ skipping 943 matching lines @@
     return;
 
   browser_view_renderer_.TrimMemory(level, visible);
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview