Merge 273865 "Use LoadURLWithParams in ChromeWebContentsDelegate..."

content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java

Index: content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
===================================================================
--- content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java	(revision 274887)
+++ content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java	(working copy)
@@ -47,6 +47,7 @@
     String mBaseUrlForDataUrl;
     String mVirtualUrlForDataUrl;
     boolean mCanLoadLocalResources;
+    boolean mIsRendererInitiated;
 
     /**
      * Creates an instance with default page transition type.
@@ -359,6 +360,20 @@
         return mLoadUrlType;
     }
 
+    /**
+     * @param rendererInitiated Whether or not this load was initiated from a renderer.
+     */
+    public void setIsRendererInitiated(boolean rendererInitiated) {
+        mIsRendererInitiated = rendererInitiated;
+    }
+
+    /**
+     * @return Whether or not this load was initiated from a renderer or not.
+     */
+    public boolean getIsRendererInitiated() {
+        return mIsRendererInitiated;
+    }
+
     public boolean isBaseUrlDataScheme() {
         // If there's no base url set, but this is a data load then
         // treat the scheme as data:.