Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkimport/AndroidBrowserProviderIterator.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkimport/AndroidBrowserProviderIterator.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkimport/AndroidBrowserProviderIterator.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkimport/AndroidBrowserProviderIterator.java
deleted file mode 100644
index ac405bf22a58b4ecc6a62140db5c3bdb17c3b357..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkimport/AndroidBrowserProviderIterator.java
+++ /dev/null
@@ -1,99 +0,0 @@
-// 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.bookmarkimport;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.provider.Browser;
-import android.provider.Browser.BookmarkColumns;
-
-import java.util.NoSuchElementException;
-
-/**
- * Imports bookmarks from Android Browser using the public provider API.
- */
-class AndroidBrowserProviderIterator implements BookmarkImporter.BookmarkIterator {
-    private static final String SELECT_IS_BOOKMARK = BookmarkColumns.BOOKMARK + "=1";
-
-    private final Cursor mCursor;
-    private long mNextId = BookmarkImporter.ROOT_FOLDER_ID + 1;
-
-    static boolean isProviderAvailable(ContentResolver contentResolver) {
-        ContentProviderClient providerClient = contentResolver.acquireContentProviderClient(
-                Browser.BOOKMARKS_URI);
-        if (providerClient != null) {
-            providerClient.release();
-            return true;
-        }
-        return false;
-    }
-
-    static AndroidBrowserProviderIterator createIfAvailable(
-            ContentResolver contentResolver) {
-        Cursor cursor = contentResolver.query(Browser.BOOKMARKS_URI, null, SELECT_IS_BOOKMARK,
-                null, null);
-        return cursor == null ? null : new AndroidBrowserProviderIterator(cursor);
-    }
-
-    private AndroidBrowserProviderIterator(Cursor cursor) {
-        mCursor = cursor;
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void close() {
-        if (mCursor == null) throw new IllegalStateException();
-        mCursor.close();
-    }
-
-    @Override
-    public boolean hasNext() {
-        if (mCursor == null) throw new IllegalStateException();
-        return mCursor.getCount() > 0 && !mCursor.isLast() && !mCursor.isAfterLast();
-    }
-
-    @Override
-    public BookmarkImporter.Bookmark next() {
-        if (mCursor == null) throw new IllegalStateException();
-        if (!mCursor.moveToNext()) throw new NoSuchElementException();
-
-        BookmarkImporter.Bookmark bookmark = new BookmarkImporter.Bookmark();
-        try {
-            bookmark.url = mCursor.getString(mCursor.getColumnIndexOrThrow(BookmarkColumns.URL));
-            bookmark.title =
-                    mCursor.getString(mCursor.getColumnIndexOrThrow(BookmarkColumns.TITLE));
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-
-        if (bookmark.url == null || bookmark.title == null) {
-            return null;
-        }
-
-        int index = mCursor.getColumnIndex(BookmarkColumns.CREATED);
-        if (index != -1 && !mCursor.isNull(index)) bookmark.created = mCursor.getLong(index);
-
-        index = mCursor.getColumnIndex(BookmarkColumns.DATE);
-        if (index != -1 && !mCursor.isNull(index)) bookmark.lastVisit = mCursor.getLong(index);
-
-        index = mCursor.getColumnIndex(BookmarkColumns.VISITS);
-        if (index != -1 && !mCursor.isNull(index)) bookmark.visits = mCursor.getLong(index);
-
-        index = mCursor.getColumnIndex(BookmarkColumns.FAVICON);
-        if (index != -1 && !mCursor.isNull(index)) bookmark.favicon = mCursor.getBlob(index);
-
-        // Add hierarchy information (flat).
-        bookmark.id = mNextId++;
-        bookmark.parentId = BookmarkImporter.ROOT_FOLDER_ID;
-        bookmark.isFolder = false;
-
-        return bookmark;
-    }
-}