Add gn args and BUILDFLAGS for OfflinePages, instead on relying on is_android and is_official_build.

chrome/browser/android/chrome_jni_registrar.cc

 // Copyright (c) 2012 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/chrome_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 164 matching lines @@
 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h"
 #include "components/dom_distiller/content/browser/android/content_jni_registrar.h"
 #include "components/dom_distiller/core/android/core_jni_registrar.h"
 #include "components/feature_engagement_tracker/public/android/feature_engagement_tracker_jni_registrar.h"
 #include "components/gcm_driver/android/component_jni_registrar.h"
 #include "components/gcm_driver/instance_id/android/component_jni_registrar.h"
 #include "components/invalidation/impl/android/component_jni_registrar.h"
 #include "components/offline_items_collection/core/android/offline_content_aggregator_bridge.h"
+#include "components/offline_pages/features/features.h"

[dewittj, 2017/05/11 17:03:40]

nit: why add this now?

[Dmitry Titov, 2017/05/11 17:35:04]

It defines the BUILDFLAG(ENABLE_OFFLINE_PAGES_HARNESS) used below. This seems to
be a regular practice for features.h files to build those and include
unconditionally - see printing/features in this file for example.

 #include "components/payments/content/android/component_jni_registrar.h"
 #include "components/policy/core/browser/android/component_jni_registrar.h"
 #include "components/safe_browsing_db/android/jni_registrar.h"
 #include "components/safe_json/android/component_jni_registrar.h"
 #include "components/signin/core/browser/android/component_jni_registrar.h"
 #include "components/spellcheck/browser/android/component_jni_registrar.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "components/sync/android/sync_jni_registrar.h"
 #include "components/url_formatter/android/component_jni_registrar.h"
 #include "components/variations/android/component_jni_registrar.h"
 #include "components/web_contents_delegate_android/component_jni_registrar.h"
 #include "device/vr/features/features.h"
 #include "printing/features/features.h"
 
 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)
 #include "printing/printing_context_android.h"
 #endif
 
 #if BUILDFLAG(ENABLE_VR)
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
 #include "third_party/gvr-android-sdk/display_synchronizer_jni.h"
 #include "third_party/gvr-android-sdk/gvr_api_jni.h"
 #include "third_party/gvr-android-sdk/native_callbacks_jni.h"
 #endif
 
-#if !defined(OFFICIAL_BUILD)
+#if BUILDFLAG(ENABLE_OFFLINE_PAGES_HARNESS)
 #include "chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.h"
 #endif
 
 namespace android {
 
 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     // Register JNI for components we depend on.
     {"AppMenuDragHelper", RegisterAppMenuDragHelper},
     {"DomDistillerContent",
      dom_distiller::content::android::RegisterDomDistiller},
@@ skipping 125 matching lines @@
      chrome::android::RegisterExternalEstimateProviderAndroid},
     {"RecentTabsPagePrefs", RecentTabsPagePrefs::RegisterJni},
     {"NotificationPlatformBridge",
      NotificationPlatformBridgeAndroid::RegisterNotificationPlatformBridge},
     {"NTPSnippetsBridge", NTPSnippetsBridge::Register},
     {"OAuth2TokenServiceDelegateAndroid",
      OAuth2TokenServiceDelegateAndroid::Register},
     {"OfflinePageBridge", offline_pages::android::RegisterOfflinePageBridge},
     {"OfflinePageDownloadBridge",
      offline_pages::android::OfflinePageDownloadBridge::Register},
-#if !defined(OFFICIAL_BUILD)
+#if BUILDFLAG(ENABLE_OFFLINE_PAGES_HARNESS)
     {"OfflinePageEvaluationBridge",
      offline_pages::android::OfflinePageEvaluationBridge::Register},
 #endif
     {"OmniboxPrerender", RegisterOmniboxPrerender},
     {"OmniboxUrlEmphasizer",
      OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
     {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil},
     {"OriginVerifier", customtabs::RegisterOriginVerifier},
     {"OverlayPanelContent", RegisterOverlayPanelContent},
     {"PartnerBookmarksReader",
@@ skipping 93 matching lines @@
 #endif
 };
 
 bool RegisterBrowserJNI(JNIEnv* env) {
   TRACE_EVENT0("startup", "chrome_android::RegisterJni");
   return RegisterNativeMethods(env, kChromeRegisteredMethods,
                                arraysize(kChromeRegisteredMethods));
 }
 
 }  // namespace android