Move PageInfoV2 to components/page_info/

The flag is needed outside components/page_info/android.

Bug: 1077766
Change-Id: Iae87a1229eec1aa0cedf8b957b1bfb940f2d941c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2400519
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805267}

chrome/browser/about_flags.cc

@@ -101,7 +101,7 @@
 #include "components/offline_pages/core/offline_page_feature.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/common/omnibox_features.h"
-#include "components/page_info/android/features.h"
+#include "components/page_info/features.h"
 #include "components/paint_preview/buildflags/buildflags.h"
 #include "components/paint_preview/features/features.h"
 #include "components/password_manager/core/common/password_manager_features.h"

components/page_info/BUILD.gn

@@ -4,6 +4,8 @@ if (is_android) {
 
 static_library("page_info") {
   sources = [
+    "features.cc",
+    "features.h",
     "page_info.cc",
     "page_info.h",
     "page_info_delegate.h",

components/page_info/android/BUILD.gn

@@ -10,8 +10,6 @@ static_library("android") {
     "certificate_viewer_android.cc",
     "connection_info_view_android.cc",
     "connection_info_view_android.h",
-    "features.cc",
-    "features.h",
     "page_info_client.cc",
     "page_info_client.h",
     "page_info_controller_android.cc",

components/page_info/android/page_info_feature_list.cc

@@ -6,8 +6,8 @@
 #include "base/feature_list.h"
 #include "base/notreached.h"
 #include "base/stl_util.h"
-#include "components/page_info/android/features.h"
 #include "components/page_info/android/jni_headers/PageInfoFeatureList_jni.h"
+#include "components/page_info/features.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;

components/page_info/android/features.cc → components/page_info/features.cc

@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/page_info/android/features.h"
+#include "components/page_info/features.h"
 
 #include "base/feature_list.h"
 #include "base/metrics/field_trial_params.h"
 
 namespace page_info {
 
+#if defined(OS_ANDROID)
 const base::Feature kPageInfoV2{"PageInfoV2",
                                 base::FEATURE_DISABLED_BY_DEFAULT};
+#endif
 
 }  // namespace page_info
\ No newline at end of file

components/page_info/android/features.h → components/page_info/features.h

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PAGE_INFO_ANDROID_FEATURES_H_
-#define COMPONENTS_PAGE_INFO_ANDROID_FEATURES_H_
+#ifndef COMPONENTS_PAGE_INFO_FEATURES_H_
+#define COMPONENTS_PAGE_INFO_FEATURES_H_
+
+#include "build/build_config.h"
 
 namespace base {
 struct Feature;
@@ -11,8 +13,10 @@ struct Feature;
 
 namespace page_info {
 
+#if defined(OS_ANDROID)
 // Enables the second version of the Page Info View.
 extern const base::Feature kPageInfoV2;
+#endif
 
 }  // namespace page_info