am 93c39d5d: DO NOT MERGE Fix issues during backport

    private final CallbackProxy mCallbackProxy;

    private final WebSettingsClassic mSettings;

    private final Context mContext;

    private final WebViewDatabaseClassic mDatabase;

    private final WebViewCore mWebViewCore;

    /* package */ boolean mLoadInitFromJava;

    private int mLoadType;

        mSettings = settings;

        mContext = context;

        mCallbackProxy = proxy;

        mDatabase = WebViewDatabaseClassic.getInstance(appContext);

        mWebViewCore = w;

        mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy);

            // the post data (there could be another form on the

            // page and that was posted instead.

            String postString = new String(postData);

            WebViewDatabaseClassic db = WebViewDatabaseClassic.getInstance(mContext);

            if (postString.contains(URLEncoder.encode(username)) &&

                    postString.contains(URLEncoder.encode(password))) {

                String[] saved = db.getUsernamePassword(schemePlusHost);

                String[] saved = mDatabase.getUsernamePassword(schemePlusHost);

                if (saved != null) {

                    // null username implies that user has chosen not to

                    // save password

                        // non-null username implies that user has

                        // chosen to save password, so update the

                        // recorded password

                        db.setUsernamePassword(schemePlusHost, username,

                        mDatabase.setUsernamePassword(schemePlusHost, username,

                                password);

                    }

                } else {