Move JNI bindings for url_formatter from chrome to //components/url_formatter

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java

 // Copyright 2015 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.chrome.browser.bookmarks;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.SynchronousInitializationActivity;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
-import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.chrome.browser.widget.EmptyAlertEditText;
 import org.chromium.chrome.browser.widget.TintedDrawable;
 import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.components.url_formatter.UrlFormatter;
 
 /**
  * The activity that enables the user to modify the title, url and parent folder of a bookmark.
  */
 public class BookmarkEditActivity extends SynchronousInitializationActivity {
     /** The intent extra specifying the ID of the bookmark to be edited. */
     public static final String INTENT_BOOKMARK_ID = "BookmarkEditActivity.BookmarkId";
 
     private static final String TAG = "BookmarkEdit";
 
@@ skipping 101 matching lines @@
                     mModel.getBookmarkById(mBookmarkId).getUrl();
             final String title = mTitleEditText.getTrimmedText();
             final String url = mUrlEditText.getTrimmedText();
 
             if (!mTitleEditText.isEmpty()) {
                 mModel.setBookmarkTitle(mBookmarkId, title);
             }
 
             if (!mUrlEditText.isEmpty()
                     && mModel.getBookmarkById(mBookmarkId).isUrlEditable()) {
-                String fixedUrl = UrlUtilities.fixupUrl(url);
+                String fixedUrl = UrlFormatter.fixupUrl(url);
                 if (fixedUrl != null && !fixedUrl.equals(originalUrl)) {
                     mModel.setBookmarkUrl(mBookmarkId, fixedUrl);
                 }
             }
         }
 
         super.onStop();
     }
 
     @Override
@@ skipping 12 matching lines @@
             Intent intent = new Intent();
             intent.putExtra(BookmarkActivity.INTENT_VISIT_BOOKMARK_ID, mBookmarkId.toString());
             setResult(RESULT_OK, intent);
         } else {
             BookmarkUtils.openBookmark(
                     mModel, this, mBookmarkId, BookmarkLaunchLocation.BOOKMARK_EDITOR);
         }
         finish();
     }
 }