Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java

 // Copyright 2013 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.
 
 package org.chromium.android_webview;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ skipping 117 matching lines @@
         // This is only called in chrome layers.
         assert false;
     }
 
     @Override
     public void closeContents() {
         mContentsClient.onCloseWindow();
     }
 
     @Override
     public void showRepostFormWarningDialog(final ContentViewCore contentViewCore) {

[boliu, 2014/09/13 00:38:53]

Content should pass up a NavigationController instead. Should clean this up in a
follow up.

[AKVT, 2014/09/13 11:30:50]

@boliu. I will correct in follow up patch.

         // TODO(mkosiba) We should be using something akin to the JsResultReceiver as the
         // callback parameter (instead of ContentViewCore) and implement a way of converting
         // that to a pair of messages.
         final int msgContinuePendingReload = 1;
         final int msgCancelPendingReload = 2;
 
         // TODO(sgurun) Remember the URL to cancel the reload behavior
         // if it is different than the most recent NavigationController entry.
         final Handler handler = new Handler(ThreadUtils.getUiThreadLooper()) {
             @Override
             public void handleMessage(Message msg) {
                 switch(msg.what) {
                     case msgContinuePendingReload: {
-                        contentViewCore.continuePendingReload();
+                        contentViewCore.getWebContents().getNavigationController()
+                                .continuePendingReload();
                         break;
                     }
                     case msgCancelPendingReload: {
-                        contentViewCore.cancelPendingReload();
+                        contentViewCore.getWebContents().getNavigationController()
+                                .cancelPendingReload();
                         break;
                     }
                     default:
                         throw new IllegalStateException(
                                 "WebContentsDelegateAdapter: unhandled message " + msg.what);
                 }
             }
         };
 
         Message resend = handler.obtainMessage(msgContinuePendingReload);
@@ skipping 84 matching lines @@
          * or an empty string otherwise.
          */
         private String resolveFileName(String filePath) {
             if (mContentResolver == null || filePath == null) return "";
             Uri uri = Uri.parse(filePath);
             return ContentUriUtils.getDisplayName(
                     uri, mContentResolver, MediaStore.MediaColumns.DISPLAY_NAME);
         }
     }
 }