From: thermatk <thermatk@thermatk.com>
Date: Fri, 22 Jun 2018 17:16:07 +0200
Subject: kill TOS

---
 .../android/java/res/layout/fre_tosanduma.xml |  9 ------
 chrome/android/java/res/values/dimens.xml     |  1 -
 .../firstrun/ToSAndUMAFirstRunFragment.java   | 29 -------------------
 3 files changed, 39 deletions(-)

diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
--- a/chrome/android/java/res/layout/fre_tosanduma.xml
+++ b/chrome/android/java/res/layout/fre_tosanduma.xml
@@ -83,15 +83,6 @@
                         android:layout_marginTop="@dimen/fre_vertical_spacing"
                         android:layout_marginBottom="@dimen/fre_tos_bottom_margin"
                         android:lineSpacingMultiplier="1.4"
-                        android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
-
-                    <CheckBox
-                        android:id="@+id/send_report_checkbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:lineSpacingMultiplier="1.4"
-                        android:text="@string/fre_send_report_check"
-                        android:paddingStart="@dimen/fre_tos_checkbox_padding"
                         android:textAppearance="@style/TextAppearance.TextMedium.Primary" android:visibility="gone" />
                 </LinearLayout>
 
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -125,7 +125,6 @@
     <dimen name="fre_image_bottom_margin">36dp</dimen>
     <dimen name="fre_image_height">120dp</dimen>
     <dimen name="fre_tos_image_height">110dp</dimen>
-    <dimen name="fre_tos_checkbox_padding">12dp</dimen>
     <dimen name="fre_tos_bottom_margin">16dp</dimen>
     <dimen name="fre_loading_spinner_size">48dp</dimen>
     <dimen name="fre_bottom_loading_spinner_size">24dp</dimen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImp
 import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
 import org.chromium.chrome.browser.ui.signin.fre.FreUMADialogCoordinator;
 import org.chromium.chrome.browser.version.ChromeVersionInfo;
-import org.chromium.components.signin.ChildAccountStatus;
 import org.chromium.ui.modaldialog.ModalDialogManagerHolder;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;
@@ -115,37 +114,9 @@ public class ToSAndUMAFirstRunFragment
 
         final CharSequence tosText;
         Bundle freProperties = getPageDelegate().getProperties();
-        @ChildAccountStatus.Status
-        int childAccountStatus = freProperties.getInt(
-                SyncConsentFirstRunFragment.CHILD_ACCOUNT_STATUS, ChildAccountStatus.NOT_CHILD);
-        if (showUmaDialog) {
-            final NoUnderlineClickableSpan clickableUMADialogSpan =
-                    new NoUnderlineClickableSpan(resources, (view1) -> openUmaDialog());
-            if (childAccountStatus == ChildAccountStatus.REGULAR_CHILD) {
-                tosText = SpanApplier.applySpans(
-                        getString(R.string.signin_fre_footer_supervised_user),
-                        new SpanInfo("<TOS_LINK>", "</TOS_LINK>", clickableGoogleTermsSpan),
-                        new SpanInfo("<PRIVACY_LINK>", "</PRIVACY_LINK>",
-                                clickableFamilyLinkPrivacySpan),
-                        new SpanInfo("<UMA_LINK>", "</UMA_LINK>", clickableUMADialogSpan));
-            } else {
-                tosText = SpanApplier.applySpans(getString(R.string.signin_fre_footer),
-                        new SpanInfo("<TOS_LINK>", "</TOS_LINK>", clickableGoogleTermsSpan),
-                        new SpanInfo("<UMA_LINK>", "</UMA_LINK>", clickableUMADialogSpan));
-            }
-        } else {
-            if (childAccountStatus == ChildAccountStatus.REGULAR_CHILD) {
-                tosText = SpanApplier.applySpans(
-                        getString(R.string.fre_tos_and_privacy_child_account),
-                        new SpanInfo("<LINK1>", "</LINK1>", clickableGoogleTermsSpan),
-                        new SpanInfo("<LINK2>", "</LINK2>", clickableChromeAdditionalTermsSpan),
-                        new SpanInfo("<LINK3>", "</LINK3>", clickableFamilyLinkPrivacySpan));
-            } else {
                 tosText = SpanApplier.applySpans(getString(R.string.fre_tos),
                         new SpanInfo("<LINK1>", "</LINK1>", clickableGoogleTermsSpan),
                         new SpanInfo("<LINK2>", "</LINK2>", clickableChromeAdditionalTermsSpan));
-            }
-        }
         mTosAndPrivacy.setText(tosText);
 
         // If this page should be skipped, it can be one of the following cases:
--
2.25.1