OfflinePageModel cleanups - improved CanSavePage() and moved static kInvalidOfflineId to impl

chrome/browser/android/offline_pages/offline_page_bridge.cc

 // 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.
 
 #include "chrome/browser/android/offline_pages/offline_page_bridge.h"
 
 #include <memory>
+#include <set>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
 #include "chrome/browser/android/offline_pages/request_coordinator_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "components/offline_pages/background/request_coordinator.h"
@@ skipping 126 matching lines @@
 
 static jboolean IsBackgroundLoadingEnabled(JNIEnv* env,
                                            const JavaParamRef<jclass>& clazz) {
   return offline_pages::IsOfflinePagesBackgroundLoadingEnabled();
 }
 
 static jboolean CanSavePage(JNIEnv* env,
                             const JavaParamRef<jclass>& clazz,
                             const JavaParamRef<jstring>& j_url) {
   GURL url(ConvertJavaStringToUTF8(env, j_url));
-  return url.is_valid() && OfflinePageModel::CanSavePage(url);
+  return OfflinePageUtils::CanSaveURL(url);

[dewittj, 2016/06/01 16:05:04]

nit: just combine the two lines

[dougarnett, 2016/06/01 22:40:22]

Done.

 }
 
 static ScopedJavaLocalRef<jobject> GetOfflinePageBridgeForProfile(
     JNIEnv* env,
     const JavaParamRef<jclass>& jcaller,
     const JavaParamRef<jobject>& j_profile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
 
   OfflinePageModel* offline_page_model =
       OfflinePageModelFactory::GetForBrowserContext(profile);
@@ skipping 245 matching lines @@
       ConvertUTF8ToJavaString(env, client_id.name_space).obj(),
       ConvertUTF8ToJavaString(env, client_id.id).obj());
 }
 
 bool RegisterOfflinePageBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace offline_pages