[WebLayer] Componentize CookieControlsEnforcement.

This is so PageInfoController, which will be componentized soon, can
continue to use CookieControlsObserver.
See https://chromium-review.googlesource.com/c/chromium/src/+/2151455 for
how I build upon this change.

Bug: 1052375
Change-Id: I156489282000e92b0a93d6abf5abb5c05d3d2918
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152829
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760160}

chrome/android/BUILD.gn

@@ -473,7 +473,6 @@ android_library("chrome_java") {
     "//chrome/browser:sharing_send_message_result_generated_enum",
     "//chrome/browser/notifications/scheduler/public:jni_enums",
     "//chrome/browser/supervised_user/supervised_user_error_page:enums_srcjar",
-    "//chrome/browser/ui:cookie_controls_enforcement_javagen",
     "//chrome/browser/updates/announcement_notification:jni_enums",
     "//components/autofill_assistant/browser:autofill_assistant_enums_java",
     "//components/browsing_data/core:browsing_data_utils_java",

chrome/browser/android/preferences/cookie_controls_service_bridge.cc

@@ -10,6 +10,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service_factory.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 
 using base::android::JavaParamRef;
 

chrome/browser/android/preferences/cookie_controls_service_bridge.h

@@ -7,6 +7,7 @@
 
 #include "base/android/jni_weak_ref.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 
 // Communicates between CookieControlsService (C++ backend) and observers
 // in the Incognito NTP Java UI.

chrome/browser/ui/BUILD.gn

@@ -438,6 +438,7 @@ jumbo_static_library("ui") {
     "//components/content_settings/browser",
     "//components/content_settings/common:mojom",
     "//components/content_settings/core/browser",
+    "//components/content_settings/core/common",
     "//components/country_codes",
     "//components/crx_file",
     "//components/data_reduction_proxy/core/browser",
@@ -4470,10 +4471,6 @@ if (is_chromeos) {
 }
 
 if (is_android) {
-  java_cpp_enum("cookie_controls_enforcement_javagen") {
-    sources = [ "cookie_controls/cookie_controls_service.h" ]
-  }
-
   java_cpp_enum("tab_model_enums_java") {
     sources = [ "android/tab_model/tab_model.h" ]
   }

chrome/browser/ui/cookie_controls/cookie_controls_controller.cc

@@ -17,6 +17,7 @@
 #include "components/content_settings/browser/tab_specific_content_settings.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/common/content_settings.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/page_info/android/cookie_controls_status.h"
 #include "components/prefs/pref_service.h"

chrome/browser/ui/cookie_controls/cookie_controls_controller.h

@@ -9,6 +9,7 @@
 #include "base/observer_list.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
 #include "components/content_settings/browser/tab_specific_content_settings.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "components/page_info/android/cookie_controls_status.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "content/public/browser/web_contents.h"

chrome/browser/ui/cookie_controls/cookie_controls_controller_unittest.cc

@@ -12,6 +12,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/browser/tab_specific_content_settings.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "components/content_settings/core/common/features.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/prefs/pref_service.h"

chrome/browser/ui/cookie_controls/cookie_controls_service.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 
 #include <utility>
 

chrome/browser/ui/cookie_controls/cookie_controls_service.h

@@ -10,6 +10,7 @@
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/common/content_settings.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "url/gurl.h"
@@ -24,15 +25,6 @@ namespace policy {
 class PolicyChangeRegistrar;
 }
 
-// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings
-enum class CookieControlsEnforcement {
-  kNoEnforcement = 0,
-  kEnforcedByPolicy = 1,
-  kEnforcedByExtension = 2,
-  kEnforcedByCookieSetting = 3,
-  kMaxValue = kEnforcedByCookieSetting,
-};
-
 // // Handles the global state for cookie settings changes and observation.
 class CookieControlsService : public KeyedService {
  public:

chrome/browser/ui/cookie_controls/cookie_controls_service_factory.cc

@@ -7,6 +7,7 @@
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 // static

chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service_factory.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 
 #include "base/test/scoped_feature_list.h"
 #include "base/values.h"

chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.h

@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/cookie_controls/cookie_controls_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "components/page_info/android/cookie_controls_status.h"
 #include "ui/views/bubble/tooltip_icon.h"
 #include "ui/views/controls/button/button.h"

chrome/browser/ui/webui/ntp/cookie_controls_handler.cc

@@ -13,6 +13,7 @@
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service_factory.h"
 #include "chrome/common/chrome_features.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 
 namespace {
 static const char* kPolicyIcon = "cr20:domain";

chrome/browser/ui/webui/ntp/cookie_controls_handler.h

@@ -9,6 +9,7 @@
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace base {

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

@@ -41,6 +41,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
+#include "components/content_settings/core/common/cookie_controls_enforcement.h"
 #include "components/content_settings/core/common/features.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/google/core/common/google_util.h"

components/content_settings/android/BUILD.gn

@@ -27,5 +27,8 @@ source_set("android") {
 }
 
 java_cpp_enum("content_setting_javagen") {
-  sources = [ "../core/common/content_settings.h" ]
+  sources = [
+    "../core/common/content_settings.h",
+    "../core/common/cookie_controls_enforcement.h",
+  ]
 }

components/content_settings/core/common/BUILD.gn

@@ -21,6 +21,7 @@ jumbo_static_library("common") {
     "content_settings_types.h",
     "content_settings_utils.cc",
     "content_settings_utils.h",
+    "cookie_controls_enforcement.h",
     "cookie_settings_base.cc",
     "cookie_settings_base.h",
     "pref_names.cc",

components/content_settings/core/common/cookie_controls_enforcement.h

+// Copyright 2020 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.
+
+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_CONTROLS_ENFORCEMENT_H_
+#define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_CONTROLS_ENFORCEMENT_H_
+
+// Enum to denote whether cookie controls are enforced, and how.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings
+enum class CookieControlsEnforcement {
+  kNoEnforcement = 0,
+  kEnforcedByPolicy = 1,
+  kEnforcedByExtension = 2,
+  kEnforcedByCookieSetting = 3,
+  kMaxValue = kEnforcedByCookieSetting,
+};
+
+#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_CONTROLS_ENFORCEMENT_H_