Safety check on Android: added the managed icon for Safe Browsing

Screenshot: https://screenshot.googleplex.com/4AkKd8rHMgB.png

Bug: 1070620
Change-Id: I132b669082b09243301927b1f74d3d9809e8d684
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329166
Commit-Queue: Andrey Zaytsev <andzaytsev@google.com>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Auto-Submit: Andrey Zaytsev <andzaytsev@google.com>
Cr-Commit-Position: refs/heads/master@{#793670}

chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionView.java

@@ -356,7 +356,7 @@ public class IncognitoDescriptionView extends LinearLayout {
         String addition;
         switch (enforcement) {
             case CookieControlsEnforcement.ENFORCED_BY_POLICY:
-                iconRes = R.drawable.controlled_setting_mandatory;
+                iconRes = R.drawable.ic_business_small;
                 addition = resources.getString(R.string.managed_by_your_organization);
                 break;
             case CookieControlsEnforcement.ENFORCED_BY_COOKIE_SETTING:

chrome/browser/safety_check/android/java/src/org/chromium/chrome/browser/safety_check/SafetyCheckViewBinder.java

@@ -100,9 +100,10 @@ class SafetyCheckViewBinder {
             case SafeBrowsingState.ENABLED_ENHANCED:
                 return R.drawable.ic_done_blue;
             case SafeBrowsingState.DISABLED:
-            case SafeBrowsingState.DISABLED_BY_ADMIN:
             case SafeBrowsingState.ERROR:
                 return R.drawable.ic_info_outline_grey_24dp;
+            case SafeBrowsingState.DISABLED_BY_ADMIN:
+                return R.drawable.ic_business;
             default:
                 assert false : "Unknown SafeBrowsingState value.";
         }

components/browser_ui/settings/android/BUILD.gn

@@ -39,14 +39,14 @@ android_resources("java_resources") {
     "//ui/android:ui_java_resources",
   ]
   sources = [
-    "java/res/drawable-hdpi/controlled_setting_mandatory.png",
     "java/res/drawable-hdpi/ic_account_child_grey600_36dp.png",
-    "java/res/drawable-mdpi/controlled_setting_mandatory.png",
+    "java/res/drawable-hdpi/ic_business_small.png",
     "java/res/drawable-mdpi/ic_account_child_grey600_36dp.png",
-    "java/res/drawable-xhdpi/controlled_setting_mandatory.png",
+    "java/res/drawable-mdpi/ic_business_small.png",
     "java/res/drawable-xhdpi/ic_account_child_grey600_36dp.png",
-    "java/res/drawable-xxhdpi/controlled_setting_mandatory.png",
+    "java/res/drawable-xhdpi/ic_business_small.png",
     "java/res/drawable-xxhdpi/ic_account_child_grey600_36dp.png",
+    "java/res/drawable-xxhdpi/ic_business_small.png",
     "java/res/drawable-xxxhdpi/ic_account_child_grey600_36dp.png",
     "java/res/layout/button_preference_button.xml",
     "java/res/layout/button_preference_layout.xml",

components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/ManagedPreferencesUtils.java

@@ -69,7 +69,7 @@ public class ManagedPreferencesUtils {
      * @return The resource ID for the Managed By Enterprise icon.
      */
     public static @DrawableRes int getManagedByEnterpriseIconId() {
-        return R.drawable.controlled_setting_mandatory;
+        return R.drawable.ic_business_small;
     }
 
     /**

components/browser_ui/styles/android/BUILD.gn

@@ -99,6 +99,7 @@ android_resources("java_resources") {
     "java/res/drawable-xxxhdpi/plus.png",
     "java/res/drawable-xxxhdpi/settings_all_sites.png",
     "java/res/drawable-xxxhdpi/top_round.9.png",
+    "java/res/drawable/ic_business.xml",
     "java/res/drawable/ic_data_viz_grey.xml",
     "java/res/drawable/ic_done_blue.xml",
     "java/res/drawable/ic_eye_crossed.xml",

components/browser_ui/styles/android/java/res/drawable/ic_business.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
+</vector>