Refactor the offline page storage to include client namespace and id.

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.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 org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
@@ skipping 219 matching lines @@
     * @param callback The callback to be invoked when the offline copy is saved.
     */
     public void saveOfflinePage(final BookmarkId bookmarkId, WebContents webContents,
             final AddBookmarkCallback callback) {
         assert bookmarkId.getId() != ChromeBrowserProviderClient.INVALID_BOOKMARK_ID;
         if (mOfflinePageBridge != null) {
             RecordHistogram.recordBooleanHistogram("OfflinePages.IncognitoSave",
                     webContents.isIncognito());
             mOfflinePageBridge.savePage(webContents, bookmarkId, new SavePageCallback() {
                 @Override
-                public void onSavePageDone(int savePageResult, String url) {
+                public void onSavePageDone(int savePageResult, String url, long offlineId) {
                     int saveResult;
                     if (savePageResult == SavePageResult.SUCCESS) {
                         saveResult = AddBookmarkCallback.SAVED;
                     } else if (savePageResult == SavePageResult.SKIPPED) {
                         saveResult = AddBookmarkCallback.SKIPPED;
                     } else {
                         saveResult = AddBookmarkCallback.ERROR;
                     }
                     callback.onBookmarkAdded(bookmarkId, saveResult);
                 }
@@ skipping 57 matching lines @@
         return bookmarkIds;
     }
 
     /**
      * @return Offline page bridge.
      */
     public OfflinePageBridge getOfflinePageBridge() {
         return mOfflinePageBridge;
     }
 }