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

Add gn args and BUILDFLAGS for OfflinePages, instead on relying on is_android and is_official_build.
This will reliably remove the manual test harness code from the builds tested on waterfall.
Also it's in preparation for potential move of OfflinePages to other platforms (like ChromeOS).

BUG=NONE

Review-Url: https://codereview.chromium.org/2875853003
Cr-Commit-Position: refs/heads/master@{#471023}

chrome/browser/BUILD.gn

@@ -8,6 +8,7 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
+import("//components/offline_pages/features/features.gni")
 import("//components/os_crypt/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//device/vr/features/features.gni")
@@ -1524,14 +1525,7 @@ split_static_library("browser") {
     "//components/ntp_snippets",
     "//components/ntp_tiles",
     "//components/offline_items_collection/core",
-    "//components/offline_pages/content",
-    "//components/offline_pages/content/background_loader",
-    "//components/offline_pages/core",
-    "//components/offline_pages/core/background:background_offliner",
-    "//components/offline_pages/core/downloads:offline_pages_ui_adapter",
-    "//components/offline_pages/core/prefetch",
-    "//components/offline_pages/core/recent_tabs",
-    "//components/offline_pages/core/request_header:request_header",
+    "//components/offline_pages/features:features",
     "//components/omnibox/browser",
     "//components/os_crypt",
     "//components/packed_ct_ev_whitelist",
@@ -2116,6 +2110,77 @@ split_static_library("browser") {
       "//third_party/adobe/flash:flapper_version_h",
     ]
   }
+
+  if (enable_offline_pages) {
+    sources += [
+      "android/offline_pages/background_loader_offliner.cc",
+      "android/offline_pages/background_loader_offliner.h",
+      "android/offline_pages/background_scheduler_bridge.cc",
+      "android/offline_pages/background_scheduler_bridge.h",
+      "android/offline_pages/downloads/offline_page_download_bridge.cc",
+      "android/offline_pages/downloads/offline_page_download_bridge.h",
+      "android/offline_pages/downloads/offline_page_infobar_delegate.cc",
+      "android/offline_pages/downloads/offline_page_infobar_delegate.h",
+      "android/offline_pages/downloads/offline_page_notification_bridge.cc",
+      "android/offline_pages/downloads/offline_page_notification_bridge.h",
+      "android/offline_pages/downloads/resource_throttle.cc",
+      "android/offline_pages/downloads/resource_throttle.h",
+      "android/offline_pages/offline_page_bookmark_observer.cc",
+      "android/offline_pages/offline_page_bookmark_observer.h",
+      "android/offline_pages/offline_page_bridge.cc",
+      "android/offline_pages/offline_page_bridge.h",
+      "android/offline_pages/offline_page_info_handler.cc",
+      "android/offline_pages/offline_page_info_handler.h",
+      "android/offline_pages/offline_page_mhtml_archiver.cc",
+      "android/offline_pages/offline_page_mhtml_archiver.h",
+      "android/offline_pages/offline_page_model_factory.cc",
+      "android/offline_pages/offline_page_model_factory.h",
+      "android/offline_pages/offline_page_request_interceptor.cc",
+      "android/offline_pages/offline_page_request_interceptor.h",
+      "android/offline_pages/offline_page_request_job.cc",
+      "android/offline_pages/offline_page_request_job.h",
+      "android/offline_pages/offline_page_tab_helper.cc",
+      "android/offline_pages/offline_page_tab_helper.h",
+      "android/offline_pages/offline_page_utils.cc",
+      "android/offline_pages/offline_page_utils.h",
+      "android/offline_pages/offliner_helper.cc",
+      "android/offline_pages/offliner_helper.h",
+      "android/offline_pages/prefetch/prefetch_background_task.cc",
+      "android/offline_pages/prefetch/prefetch_background_task.h",
+      "android/offline_pages/prerender_adapter.cc",
+      "android/offline_pages/prerender_adapter.h",
+      "android/offline_pages/prerendering_loader.cc",
+      "android/offline_pages/prerendering_loader.h",
+      "android/offline_pages/prerendering_offliner.cc",
+      "android/offline_pages/prerendering_offliner.h",
+      "android/offline_pages/recent_tab_helper.cc",
+      "android/offline_pages/recent_tab_helper.h",
+      "android/offline_pages/request_coordinator_factory.cc",
+      "android/offline_pages/request_coordinator_factory.h",
+    ]
+    deps += [
+      "//components/offline_pages/content",
+      "//components/offline_pages/content/background_loader",
+      "//components/offline_pages/core",
+      "//components/offline_pages/core/background:background_offliner",
+      "//components/offline_pages/core/downloads:offline_pages_ui_adapter",
+      "//components/offline_pages/core/prefetch",
+      "//components/offline_pages/core/recent_tabs",
+      "//components/offline_pages/core/request_header:request_header",
+    ]
+  }
+
+  # Used to build test harness locally. The harness is used manually to
+  # produce multiple offline pages to evaluate quality of the snapshots.
+  if (enable_offline_pages_harness) {
+    sources += [
+      "android/offline_pages/evaluation/evaluation_test_scheduler.cc",
+      "android/offline_pages/evaluation/evaluation_test_scheduler.h",
+      "android/offline_pages/evaluation/offline_page_evaluation_bridge.cc",
+      "android/offline_pages/evaluation/offline_page_evaluation_bridge.h",
+    ]
+  }
+
   if (safe_browsing_mode != 0) {
     # "Safe Browsing Basic" files used for safe browsing in full mode
     # (safe_browsing=1) and mobile (=2)
@@ -2879,50 +2944,6 @@ split_static_library("browser") {
       "android/ntp/recent_tabs_page_prefs.h",
       "android/ntp/suggestions_event_reporter_bridge.cc",
       "android/ntp/suggestions_event_reporter_bridge.h",
-      "android/offline_pages/background_loader_offliner.cc",
-      "android/offline_pages/background_loader_offliner.h",
-      "android/offline_pages/background_scheduler_bridge.cc",
-      "android/offline_pages/background_scheduler_bridge.h",
-      "android/offline_pages/downloads/offline_page_download_bridge.cc",
-      "android/offline_pages/downloads/offline_page_download_bridge.h",
-      "android/offline_pages/downloads/offline_page_infobar_delegate.cc",
-      "android/offline_pages/downloads/offline_page_infobar_delegate.h",
-      "android/offline_pages/downloads/offline_page_notification_bridge.cc",
-      "android/offline_pages/downloads/offline_page_notification_bridge.h",
-      "android/offline_pages/downloads/resource_throttle.cc",
-      "android/offline_pages/downloads/resource_throttle.h",
-      "android/offline_pages/offline_page_bookmark_observer.cc",
-      "android/offline_pages/offline_page_bookmark_observer.h",
-      "android/offline_pages/offline_page_bridge.cc",
-      "android/offline_pages/offline_page_bridge.h",
-      "android/offline_pages/offline_page_info_handler.cc",
-      "android/offline_pages/offline_page_info_handler.h",
-      "android/offline_pages/offline_page_mhtml_archiver.cc",
-      "android/offline_pages/offline_page_mhtml_archiver.h",
-      "android/offline_pages/offline_page_model_factory.cc",
-      "android/offline_pages/offline_page_model_factory.h",
-      "android/offline_pages/offline_page_request_interceptor.cc",
-      "android/offline_pages/offline_page_request_interceptor.h",
-      "android/offline_pages/offline_page_request_job.cc",
-      "android/offline_pages/offline_page_request_job.h",
-      "android/offline_pages/offline_page_tab_helper.cc",
-      "android/offline_pages/offline_page_tab_helper.h",
-      "android/offline_pages/offline_page_utils.cc",
-      "android/offline_pages/offline_page_utils.h",
-      "android/offline_pages/offliner_helper.cc",
-      "android/offline_pages/offliner_helper.h",
-      "android/offline_pages/prefetch/prefetch_background_task.cc",
-      "android/offline_pages/prefetch/prefetch_background_task.h",
-      "android/offline_pages/prerender_adapter.cc",
-      "android/offline_pages/prerender_adapter.h",
-      "android/offline_pages/prerendering_loader.cc",
-      "android/offline_pages/prerendering_loader.h",
-      "android/offline_pages/prerendering_offliner.cc",
-      "android/offline_pages/prerendering_offliner.h",
-      "android/offline_pages/recent_tab_helper.cc",
-      "android/offline_pages/recent_tab_helper.h",
-      "android/offline_pages/request_coordinator_factory.cc",
-      "android/offline_pages/request_coordinator_factory.h",
       "android/omnibox/answers_image_bridge.cc",
       "android/omnibox/answers_image_bridge.h",
       "android/omnibox/autocomplete_controller_android.cc",
@@ -3218,16 +3239,6 @@ split_static_library("browser") {
         "supervised_user/child_accounts/child_account_service_android.h",
       ]
     }
-
-    # Used for testing only, should not be shipped to end users.
-    if (!is_official_build) {
-      sources += [
-        "android/offline_pages/evaluation/evaluation_test_scheduler.cc",
-        "android/offline_pages/evaluation/evaluation_test_scheduler.h",
-        "android/offline_pages/evaluation/offline_page_evaluation_bridge.cc",
-        "android/offline_pages/evaluation/offline_page_evaluation_bridge.h",
-      ]
-    }
   } else {
     # Non-Android.
     sources += [

chrome/browser/android/chrome_jni_registrar.cc

@@ -184,6 +184,7 @@
 #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"
 #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"
@@ -210,7 +211,7 @@
 #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
 
@@ -356,7 +357,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"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

components/offline_pages/features/BUILD.gn

+# Copyright 2017 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.
+
+import("//build/buildflag_header.gni")
+import("//components/offline_pages/features/features.gni")
+
+# This file is in a separate directory so all targets in the build can refer to
+# the buildflag header to get the necessary preprocessor defines without
+# bringing in all of offline_pages. Other targets can depend on this target
+# regardless of whether extensions are enabled.
+
+buildflag_header("features") {
+  header = "features.h"
+  flags = [
+    "ENABLE_OFFLINE_PAGES=$enable_offline_pages",
+    "ENABLE_OFFLINE_PAGES_HARNESS=$enable_offline_pages_harness",
+  ]
+}

components/offline_pages/features/features.gni

+# Copyright 2017 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.
+
+declare_args() {
+  # Whether to enable OfflinePages support. Currently user-visible features
+  # are Android-only.
+  enable_offline_pages = is_android
+
+  # This enables test API for locally-built harness which is used for quality
+  # evaluations. Requires setting this variable manually at local environment.
+  enable_offline_pages_harness = false
+}