Update access info when an offline page is being visited

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
index 67fe59f1eae066ff679018866b6f2c3362815316..7cab3023c0ea93bd1b72c440963ec8a7d7bf295b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
@@ -9,6 +9,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.DeletePageCallback;
+import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.MarkPageAccessedCallback;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageModelObserver;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallback;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -92,6 +93,16 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
     }
 
     @MediumTest
+    public void testMarkPageAccessed() throws Exception {
+        loadUrl(TEST_PAGE);
+        savePage(SavePageResult.SUCCESS, TEST_PAGE);
+        markPageAccessed(BOOKMARK_ID);
+        OfflinePageItem offlinePage = mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID);
+        assertNotNull("Offline page should be available, but it is not.", offlinePage);
+        assertEquals("Offline page access count should be 1.", 1, offlinePage.getAccessCount());
+    }
+
+    @MediumTest
     public void testGetPageByBookmarkId() throws Exception {
         loadUrl(TEST_PAGE);
         savePage(SavePageResult.SUCCESS, TEST_PAGE);
@@ -148,6 +159,25 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
         assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
     }
 
+    private void markPageAccessed(BookmarkId bookmarkId)
+            throws InterruptedException {
+        final Semaphore semaphore = new Semaphore(0);

[newt (away), 2015/09/21 23:02:05]

If you remove MarkPageAccessedCallback (which I'd suggest doing), then you can
replace this code with Chrome's CriteriaHelper class:

    assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
        @Override
        public boolean isSatisfied() {
            OfflinePageItem offlinePage =
mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID);
            return offlinePage.getAccessCount() == 1;
        }
    }));

This is both less test code and less production code :)

[jianli, 2015/09/23 00:11:11]

Done.

+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                mOfflinePageBridge.markPageAccessedForTest(
+                        BOOKMARK_ID, new MarkPageAccessedCallback() {
+                            @Override
+                            public void onMarkPageAccessedDone(boolean success) {
+                                assertTrue(success);
+                                semaphore.release();
+                            }
+                        });
+            }
+        });
+        assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+    }
+
     private void deletePage(BookmarkId bookmarkId, final int expectedResult)
             throws InterruptedException {
         final Semaphore semaphore = new Semaphore(0);