Remove-signin-and-data-saver-integrations.patch 152 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701170217031704170517061707170817091710171117121713171417151716171717181719172017211722172317241725172617271728172917301731173217331734173517361737173817391740174117421743174417451746174717481749175017511752175317541755175617571758175917601761176217631764176517661767176817691770177117721773177417751776177717781779178017811782178317841785178617871788178917901791179217931794179517961797179817991800180118021803180418051806180718081809181018111812181318141815181618171818181918201821182218231824182518261827182818291830183118321833183418351836183718381839184018411842184318441845184618471848184918501851185218531854185518561857185818591860186118621863186418651866186718681869187018711872187318741875187618771878187918801881188218831884188518861887188818891890189118921893189418951896189718981899190019011902190319041905190619071908190919101911191219131914191519161917191819191920192119221923192419251926192719281929193019311932193319341935193619371938193919401941194219431944194519461947194819491950195119521953195419551956195719581959196019611962196319641965196619671968196919701971197219731974197519761977197819791980198119821983198419851986198719881989199019911992199319941995199619971998199920002001200220032004200520062007200820092010201120122013201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037203820392040204120422043204420452046204720482049205020512052205320542055205620572058205920602061206220632064206520662067206820692070207120722073207420752076207720782079208020812082208320842085208620872088208920902091209220932094209520962097209820992100210121022103210421052106210721082109211021112112211321142115211621172118211921202121212221232124212521262127212821292130213121322133213421352136213721382139214021412142214321442145214621472148214921502151215221532154215521562157215821592160216121622163216421652166216721682169217021712172217321742175217621772178217921802181218221832184218521862187218821892190219121922193219421952196219721982199220022012202220322042205220622072208220922102211221222132214221522162217221822192220222122222223222422252226222722282229223022312232223322342235223622372238223922402241224222432244224522462247224822492250225122522253225422552256225722582259226022612262226322642265226622672268226922702271227222732274227522762277227822792280228122822283228422852286228722882289229022912292229322942295229622972298229923002301230223032304230523062307230823092310231123122313231423152316231723182319232023212322232323242325232623272328232923302331233223332334233523362337233823392340234123422343234423452346234723482349235023512352235323542355235623572358235923602361236223632364236523662367236823692370237123722373237423752376237723782379238023812382238323842385238623872388238923902391239223932394239523962397239823992400240124022403240424052406240724082409241024112412241324142415241624172418241924202421242224232424242524262427242824292430243124322433243424352436243724382439244024412442244324442445244624472448244924502451245224532454245524562457245824592460246124622463246424652466246724682469247024712472247324742475247624772478247924802481248224832484248524862487248824892490249124922493249424952496249724982499250025012502250325042505250625072508250925102511251225132514251525162517251825192520252125222523252425252526252725282529253025312532253325342535253625372538253925402541254225432544254525462547254825492550255125522553255425552556255725582559256025612562256325642565256625672568256925702571257225732574257525762577257825792580258125822583258425852586258725882589259025912592259325942595259625972598259926002601260226032604260526062607260826092610261126122613261426152616261726182619262026212622262326242625262626272628262926302631263226332634263526362637263826392640264126422643264426452646264726482649265026512652265326542655265626572658265926602661266226632664266526662667266826692670267126722673267426752676267726782679268026812682268326842685268626872688268926902691269226932694269526962697269826992700270127022703270427052706270727082709271027112712271327142715271627172718271927202721272227232724272527262727272827292730273127322733273427352736273727382739274027412742274327442745274627472748274927502751275227532754275527562757275827592760276127622763276427652766276727682769277027712772277327742775277627772778277927802781278227832784278527862787278827892790279127922793279427952796279727982799280028012802280328042805280628072808280928102811281228132814281528162817281828192820282128222823282428252826282728282829283028312832283328342835283628372838283928402841
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Tue, 12 Jun 2018 14:23:07 +0200
  3. Subject: Remove signin and data saver integrations
  4. Prevents authorization prompt for Play services on reboot
  5. Remove recent tabs signin
  6. Disable data saver
  7. Never show the data saver promo snackbar
  8. Disable unused permissions from manifest
  9. Disable sync adaptive and invalidation services from manifest
  10. More permissions removal from manifest
  11. Disable promos displayed in bookmarks manager
  12. Remove personalized signin promo view from
  13. bookmarks, never reach signin thresholds.
  14. Fix building with debug symbols:
  15. ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
  16. >>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
  17. >>> impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
  18. ---
  19. chrome/android/BUILD.gn | 1 -
  20. chrome/android/chrome_java_sources.gni | 38 -----
  21. .../PriceTrackingUtilities.java | 5 +-
  22. .../browser/feed/FeedSurfaceCoordinator.java | 5 +-
  23. .../browser/feed/FeedSurfaceMediator.java | 99 +----------
  24. chrome/android/java/AndroidManifest.xml | 8 -
  25. .../android/java/res/xml/main_preferences.xml | 27 +--
  26. .../java/res/xml/privacy_preferences.xml | 4 -
  27. .../org/chromium/chrome/browser/AppHooks.java | 8 -
  28. .../chrome/browser/ChromeTabbedActivity.java | 6 -
  29. .../chrome/browser/app/ChromeActivity.java | 75 --------
  30. .../AutofillAssistantPreferenceFragment.java | 12 --
  31. .../bookmarks/BookmarkItemsAdapter.java | 50 +-----
  32. .../bookmarks/BookmarkPromoHeader.java | 160 +-----------------
  33. .../ClearBrowsingDataFragmentBasic.java | 5 +-
  34. .../contextualsearch/ContextualSearchUma.java | 5 -
  35. .../browser/customtabs/CustomTabActivity.java | 3 -
  36. .../DataReductionPreferenceFragment.java | 24 +--
  37. .../browser/firstrun/FirstRunActivity.java | 40 -----
  38. .../firstrun/FirstRunFlowSequencer.java | 31 +---
  39. .../firstrun/LightweightFirstRunActivity.java | 6 +-
  40. .../firstrun/ToSAndUMAFirstRunFragment.java | 11 --
  41. .../history/HistoryContentManager.java | 10 +-
  42. .../init/ChromeBrowserInitializer.java | 2 -
  43. .../init/ProcessInitializationHandler.java | 4 -
  44. .../chrome/browser/ntp/RecentTabsManager.java | 69 +-------
  45. .../browser/ntp/RecentTabsRowAdapter.java | 6 -
  46. .../browser/omaha/RequestGenerator.java | 3 -
  47. .../PasswordManagerLauncher.java | 15 +-
  48. .../settings/PasswordEntryViewer.java | 5 +-
  49. .../settings/PasswordSettings.java | 29 +---
  50. .../privacy/settings/PrivacySettings.java | 30 ----
  51. .../chrome/browser/settings/MainSettings.java | 135 +--------------
  52. .../browser/settings/SettingsActivity.java | 5 +-
  53. .../browser/share/ShareDelegateImpl.java | 3 +-
  54. .../share/ShareRegistrationCoordinator.java | 3 +-
  55. .../SharedClipboardShareActivity.java | 3 -
  56. .../tabbed_mode/TabbedRootUiCoordinator.java | 22 +--
  57. .../tasks/ReturnToChromeExperimentsUtil.java | 9 +-
  58. chrome/browser/BUILD.gn | 10 --
  59. .../identity_services_provider_android.cc | 9 -
  60. .../services/IdentityServicesProvider.java | 14 --
  61. ...onfirmImportSyncDataDialogCoordinator.java | 7 +-
  62. .../ui/ConfirmSyncDataStateMachine.java | 16 +-
  63. .../signin/ui/SignOutDialogFragment.java | 13 --
  64. .../signin/ui/SigninPromoController.java | 15 +-
  65. .../AccountPickerDelegateImpl.java | 18 --
  66. chrome/browser/sync/sync_service_factory.cc | 12 +-
  67. .../strings/android_chrome_strings.grd | 12 --
  68. .../signin/SystemAccountManagerDelegate.java | 35 +---
  69. .../net/HttpNegotiateAuthenticator.java | 88 +---------
  70. .../chromoting/base/OAuthTokenFetcher.java | 2 -
  71. 52 files changed, 48 insertions(+), 1179 deletions(-)
  72. diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
  73. --- a/chrome/android/BUILD.gn
  74. +++ b/chrome/android/BUILD.gn
  75. @@ -3794,7 +3794,6 @@ generate_jni("chrome_jni_headers") {
  76. "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
  77. "java/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBar.java",
  78. "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
  79. - "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java",
  80. "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
  81. "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
  82. "java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java",
  83. diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
  84. --- a/chrome/android/chrome_java_sources.gni
  85. +++ b/chrome/android/chrome_java_sources.gni
  86. @@ -606,15 +606,12 @@ chrome_java_sources = [
  87. "java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java",
  88. "java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java",
  89. "java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java",
  90. - "java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java",
  91. "java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java",
  92. "java/src/org/chromium/chrome/browser/firstrun/FirstRunView.java",
  93. - "java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java",
  94. "java/src/org/chromium/chrome/browser/firstrun/FreIntentCreator.java",
  95. "java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java",
  96. "java/src/org/chromium/chrome/browser/firstrun/PolicyLoadListener.java",
  97. "java/src/org/chromium/chrome/browser/firstrun/SkipTosDialogPolicyListener.java",
  98. - "java/src/org/chromium/chrome/browser/firstrun/SyncConsentFirstRunFragment.java",
  99. "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java",
  100. "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
  101. "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java",
  102. @@ -708,7 +705,6 @@ chrome_java_sources = [
  103. "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java",
  104. "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
  105. "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java",
  106. - "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java",
  107. "java/src/org/chromium/chrome/browser/infobar/TextViewEllipsizerSafe.java",
  108. "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
  109. "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
  110. @@ -825,7 +821,6 @@ chrome_java_sources = [
  111. "java/src/org/chromium/chrome/browser/ntp/ScrollableContainerDelegate.java",
  112. "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelper.java",
  113. "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
  114. - "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java",
  115. "java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java",
  116. "java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java",
  117. "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxChipDelegate.java",
  118. @@ -912,8 +907,6 @@ chrome_java_sources = [
  119. "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java",
  120. "java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java",
  121. "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java",
  122. - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java",
  123. - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java",
  124. "java/src/org/chromium/chrome/browser/password_manager/Credential.java",
  125. "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java",
  126. "java/src/org/chromium/chrome/browser/password_manager/GooglePasswordManagerUIProvider.java",
  127. @@ -1060,16 +1053,6 @@ chrome_java_sources = [
  128. "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java",
  129. "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java",
  130. "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
  131. - "java/src/org/chromium/chrome/browser/signin/SigninBridge.java",
  132. - "java/src/org/chromium/chrome/browser/signin/SigninChecker.java",
  133. - "java/src/org/chromium/chrome/browser/signin/SigninCheckerProvider.java",
  134. - "java/src/org/chromium/chrome/browser/signin/SigninFirstRunFragment.java",
  135. - "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java",
  136. - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java",
  137. - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImpl.java",
  138. - "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java",
  139. - "java/src/org/chromium/chrome/browser/signin/SyncConsentFragmentBase.java",
  140. - "java/src/org/chromium/chrome/browser/signin/SyncPromoView.java",
  141. "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java",
  142. "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
  143. "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java",
  144. @@ -1106,27 +1089,6 @@ chrome_java_sources = [
  145. "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java",
  146. "java/src/org/chromium/chrome/browser/survey/SurveyController.java",
  147. "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java",
  148. - "java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java",
  149. - "java/src/org/chromium/chrome/browser/sync/SyncContentResolverDelegate.java",
  150. - "java/src/org/chromium/chrome/browser/sync/SyncController.java",
  151. - "java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java",
  152. - "java/src/org/chromium/chrome/browser/sync/SyncService.java",
  153. - "java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java",
  154. - "java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java",
  155. - "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
  156. - "java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java",
  157. - "java/src/org/chromium/chrome/browser/sync/settings/ClearDataProgressDialog.java",
  158. - "java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java",
  159. - "java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java",
  160. - "java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java",
  161. - "java/src/org/chromium/chrome/browser/sync/settings/SyncErrorCardPreference.java",
  162. - "java/src/org/chromium/chrome/browser/sync/settings/SyncPromoPreference.java",
  163. - "java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java",
  164. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java",
  165. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java",
  166. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java",
  167. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java",
  168. - "java/src/org/chromium/chrome/browser/sync/ui/SyncTrustedVaultProxyActivity.java",
  169. "java/src/org/chromium/chrome/browser/tab/AccessibilityVisibilityHandler.java",
  170. "java/src/org/chromium/chrome/browser/tab/AuthenticatorNavigationInterceptorTabHelper.java",
  171. "java/src/org/chromium/chrome/browser/tab/AutofillSessionLifetimeController.java",
  172. diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
  173. --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
  174. +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
  175. @@ -14,7 +14,6 @@ import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager;
  176. import org.chromium.chrome.browser.profiles.Profile;
  177. import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  178. import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
  179. -import org.chromium.chrome.browser.sync.SyncService;
  180. import org.chromium.chrome.browser.tabmodel.TabModel;
  181. import org.chromium.components.signin.identitymanager.ConsentLevel;
  182. import org.chromium.components.sync.ModelType;
  183. @@ -188,9 +187,7 @@ public class PriceTrackingUtilities {
  184. }
  185. private static boolean isOpenTabsSyncEnabled() {
  186. - SyncService syncService = SyncService.get();
  187. - return syncService != null && syncService.isSyncRequested()
  188. - && syncService.getActiveDataTypes().contains(ModelType.SESSIONS);
  189. + return false;
  190. }
  191. private static boolean isAnonymizedUrlDataCollectionEnabled() {
  192. diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
  193. --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
  194. +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
  195. @@ -938,10 +938,7 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
  196. @Override
  197. public boolean isSignedIn() {
  198. - return IdentityServicesProvider.get()
  199. - .getSigninManager(Profile.getLastUsedRegularProfile())
  200. - .getIdentityManager()
  201. - .hasPrimaryAccount(ConsentLevel.SYNC);
  202. + return false;
  203. }
  204. @Override
  205. diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
  206. --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
  207. +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
  208. @@ -43,7 +43,6 @@ import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
  209. import org.chromium.chrome.browser.ntp.NewTabPageLayout;
  210. import org.chromium.chrome.browser.ntp.ScrollListener;
  211. import org.chromium.chrome.browser.ntp.SnapScrollHelper;
  212. -import org.chromium.chrome.browser.ntp.cards.SignInPromo;
  213. import org.chromium.chrome.browser.ntp.cards.promo.enhanced_protection.EnhancedProtectionPromoController.EnhancedProtectionPromoStateListener;
  214. import org.chromium.chrome.browser.ntp.snippets.OnSectionHeaderSelectedListener;
  215. import org.chromium.chrome.browser.ntp.snippets.SectionHeaderListProperties;
  216. @@ -53,10 +52,6 @@ import org.chromium.chrome.browser.preferences.Pref;
  217. import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
  218. import org.chromium.chrome.browser.profiles.Profile;
  219. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  220. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  221. -import org.chromium.chrome.browser.signin.services.SigninManager;
  222. -import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
  223. -import org.chromium.chrome.browser.signin.ui.SigninPromoController;
  224. import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
  225. import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
  226. import org.chromium.chrome.features.start_surface.StartSurfaceConfiguration;
  227. @@ -179,7 +174,6 @@ public class FeedSurfaceMediator
  228. /**
  229. * The {@link SignInPromo} for the Feed.
  230. * TODO(huayinz): Update content and visibility through a ModelChangeProcessor.
  231. - */
  232. private class FeedSignInPromo extends SignInPromo {
  233. FeedSignInPromo(SigninManager signinManager) {
  234. super(signinManager);
  235. @@ -200,7 +194,7 @@ public class FeedSurfaceMediator
  236. maybeUpdateSignInPromo();
  237. }
  238. - /** Update the content displayed in {@link PersonalizedSigninPromoView}. */
  239. + ** Update the content displayed in {@link PersonalizedSigninPromoView}. *
  240. private void maybeUpdateSignInPromo() {
  241. // Only call #setupPromoViewFromCache() if SignInPromo is visible to avoid potentially
  242. // blocking the UI thread for several seconds if the accounts cache is not populated
  243. @@ -222,7 +216,7 @@ public class FeedSurfaceMediator
  244. super.onDismissPromo();
  245. mCoordinator.updateHeaderViews(false, null);
  246. }
  247. - }
  248. + } */
  249. @VisibleForTesting
  250. static void setPrefForTest(PrefChangeRegistrar prefChangeRegistrar, PrefService prefService) {
  251. @@ -237,7 +231,6 @@ public class FeedSurfaceMediator
  252. private final Context mContext;
  253. private final @Nullable SnapScrollHelper mSnapScrollHelper;
  254. private final PrefChangeRegistrar mPrefChangeRegistrar;
  255. - private final SigninManager mSigninManager;
  256. private final PropertyModel mSectionHeaderModel;
  257. private final NativePageNavigationDelegate mPageNavigationDelegate;
  258. @@ -246,7 +239,6 @@ public class FeedSurfaceMediator
  259. private final ObserverList<ScrollListener> mScrollListeners = new ObserverList<>();
  260. private ContentChangedListener mStreamContentChangedListener;
  261. private MemoryPressureCallback mMemoryPressureCallback;
  262. - private @Nullable SignInPromo mSignInPromo;
  263. private RecyclerViewAnimationFinishDetector mRecyclerViewAnimationFinishDetector =
  264. new RecyclerViewAnimationFinishDetector();
  265. private @Nullable View mEnhancedProtectionPromo;
  266. @@ -295,8 +287,6 @@ public class FeedSurfaceMediator
  267. mCoordinator = coordinator;
  268. mContext = context;
  269. mSnapScrollHelper = snapScrollHelper;
  270. - mSigninManager = IdentityServicesProvider.get().getSigninManager(
  271. - Profile.getLastUsedRegularProfile());
  272. mPageNavigationDelegate = pageNavigationDelegate;
  273. if (sTestPrefChangeRegistar != null) {
  274. @@ -454,7 +444,6 @@ public class FeedSurfaceMediator
  275. mFeedMenuModel = buildMenuItems();
  276. mCoordinator.initializeBubbleTriggering();
  277. - mSigninManager.getIdentityManager().addObserver(this);
  278. mSectionHeaderModel.set(
  279. SectionHeaderListProperties.MENU_MODEL_LIST_KEY, mFeedMenuModel);
  280. @@ -506,8 +495,6 @@ public class FeedSurfaceMediator
  281. };
  282. mCoordinator.getRecyclerView().addOnScrollListener(mStreamScrollListener);
  283. - initStreamHeaderViews();
  284. -
  285. mMemoryPressureCallback =
  286. pressure -> mCoordinator.getRecyclerView().getRecycledViewPool().clear();
  287. MemoryPressureListener.addCallback(mMemoryPressureCallback);
  288. @@ -663,47 +650,6 @@ public class FeedSurfaceMediator
  289. }
  290. }
  291. - private void initStreamHeaderViews() {
  292. - boolean signInPromoVisible = createSignInPromoIfNeeded();
  293. - mEnhancedProtectionPromo = null;
  294. - if (!signInPromoVisible) {
  295. - mEnhancedProtectionPromo = createEnhancedProtectionPromoIfNeeded();
  296. - }
  297. - // We are not going to show two promos at the same time.
  298. - mCoordinator.updateHeaderViews(signInPromoVisible, mEnhancedProtectionPromo);
  299. - }
  300. -
  301. - /**
  302. - * Create and setup the SignInPromo if necessary.
  303. - * @return Whether the SignPromo should be visible.
  304. - */
  305. - private boolean createSignInPromoIfNeeded() {
  306. - SigninPromoController.resetNTPSyncPromoLimitsIfHiddenForTooLong();
  307. - if (!SignInPromo.shouldCreatePromo()
  308. - || !SigninPromoController.canShowSyncPromo(
  309. - SigninAccessPoint.NTP_CONTENT_SUGGESTIONS)) {
  310. - return false;
  311. - }
  312. - if (mSignInPromo == null) {
  313. - mSignInPromo = new FeedSignInPromo(mSigninManager);
  314. - mSignInPromo.setCanShowPersonalizedSuggestions(isSuggestionsVisible());
  315. - }
  316. - return mSignInPromo.isVisible();
  317. - }
  318. -
  319. - private View createEnhancedProtectionPromoIfNeeded() {
  320. - if (mCoordinator.getEnhancedProtectionPromoController() == null) return null;
  321. -
  322. - View enhancedProtectionPromoView =
  323. - mCoordinator.getEnhancedProtectionPromoController().getPromoView();
  324. - if (enhancedProtectionPromoView != null) {
  325. - mCoordinator.getEnhancedProtectionPromoController()
  326. - .setEnhancedProtectionPromoStateListener(this);
  327. - updatePromoCardPadding(enhancedProtectionPromoView);
  328. - }
  329. - return enhancedProtectionPromoView;
  330. - }
  331. -
  332. private void updatePromoCardPadding(View promoCard) {
  333. MarginLayoutParams layoutParams = promoCard.getLayoutParams() == null
  334. ? new MarginLayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
  335. @@ -726,11 +672,6 @@ public class FeedSurfaceMediator
  336. MemoryPressureListener.removeCallback(mMemoryPressureCallback);
  337. mMemoryPressureCallback = null;
  338. - if (mSignInPromo != null) {
  339. - mSignInPromo.destroy();
  340. - mSignInPromo = null;
  341. - }
  342. -
  343. unbindStream();
  344. for (Stream s : mTabToStreamMap.values()) {
  345. s.removeOnContentChangedListener(mStreamContentChangedListener);
  346. @@ -741,7 +682,6 @@ public class FeedSurfaceMediator
  347. mPrefChangeRegistrar.removeObserver(Pref.ARTICLES_LIST_VISIBLE);
  348. TemplateUrlServiceFactory.get().removeObserver(this);
  349. - mSigninManager.getIdentityManager().removeObserver(this);
  350. PropertyListModel<PropertyModel, PropertyKey> headerList =
  351. mSectionHeaderModel.get(SectionHeaderListProperties.SECTION_HEADERS_KEY);
  352. @@ -820,9 +760,6 @@ public class FeedSurfaceMediator
  353. // Update toggleswitch item, which is last item in list.
  354. mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, buildMenuItems());
  355. - if (mSignInPromo != null) {
  356. - mSignInPromo.setCanShowPersonalizedSuggestions(suggestionsVisible);
  357. - }
  358. if (mEnhancedProtectionPromo != null) {
  359. updatePromoCardPadding(mEnhancedProtectionPromo);
  360. }
  361. @@ -838,7 +775,7 @@ public class FeedSurfaceMediator
  362. }
  363. private boolean isSignedIn() {
  364. - return mSigninManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC);
  365. + return false;
  366. }
  367. /**
  368. @@ -886,31 +823,6 @@ public class FeedSurfaceMediator
  369. private ModelList buildMenuItems() {
  370. ModelList itemList = new ModelList();
  371. - int iconId = 0;
  372. - if (isSignedIn()) {
  373. - if (ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_FEED)) {
  374. - itemList.add(buildMenuListItem(
  375. - R.string.ntp_manage_feed, R.id.ntp_feed_header_menu_item_manage, iconId));
  376. - } else {
  377. - itemList.add(buildMenuListItem(R.string.ntp_manage_my_activity,
  378. - R.id.ntp_feed_header_menu_item_activity, iconId));
  379. - itemList.add(buildMenuListItem(R.string.ntp_manage_interests,
  380. - R.id.ntp_feed_header_menu_item_interest, iconId));
  381. - }
  382. - if (ChromeFeatureList.isEnabled(ChromeFeatureList.INTEREST_FEED_V2_HEARTS)) {
  383. - itemList.add(buildMenuListItem(R.string.ntp_manage_reactions,
  384. - R.id.ntp_feed_header_menu_item_reactions, iconId));
  385. - }
  386. - }
  387. - if (FeedServiceBridge.isAutoplayEnabled()) {
  388. - itemList.add(buildMenuListItem(
  389. - R.string.ntp_manage_autoplay, R.id.ntp_feed_header_menu_item_autoplay, iconId));
  390. - }
  391. - itemList.add(buildMenuListItem(
  392. - R.string.learn_more, R.id.ntp_feed_header_menu_item_learn, iconId));
  393. - itemList.add(getMenuToggleSwitch(
  394. - mSectionHeaderModel.get(SectionHeaderListProperties.IS_SECTION_ENABLED_KEY),
  395. - iconId));
  396. return itemList;
  397. }
  398. @@ -1112,11 +1024,6 @@ public class FeedSurfaceMediator
  399. updateSectionHeader();
  400. }
  401. - @VisibleForTesting
  402. - public SignInPromo getSignInPromoForTesting() {
  403. - return mSignInPromo;
  404. - }
  405. -
  406. public void manualRefresh(Callback<Boolean> callback) {
  407. if (mCurrentStream != null) {
  408. mCurrentStream.triggerRefresh(callback);
  409. diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
  410. --- a/chrome/android/java/AndroidManifest.xml
  411. +++ b/chrome/android/java/AndroidManifest.xml
  412. @@ -67,24 +67,18 @@ by a child template that "extends" this file.
  413. <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
  414. <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
  415. <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
  416. - <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
  417. <uses-permission android:name="android.permission.INTERNET"/>
  418. - <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
  419. <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
  420. <uses-permission android:name="android.permission.NFC"/>
  421. <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
  422. <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
  423. - <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
  424. - <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
  425. <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
  426. <uses-permission android:name="android.permission.RECORD_AUDIO"/>
  427. - <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
  428. <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
  429. <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
  430. <uses-permission android:name="android.permission.VIBRATE"/>
  431. <uses-permission android:name="android.permission.WAKE_LOCK"/>
  432. <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
  433. - <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
  434. {% set enable_vr = enable_vr|default(0) %}
  435. {% if enable_vr == "true" %}
  436. <!-- Indicates use of Android's VR-mode, available only on Android N+. -->
  437. @@ -124,8 +118,6 @@ by a child template that "extends" this file.
  438. <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
  439. <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  440. - <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
  441. -
  442. {% block extra_uses_permissions %}
  443. {% endblock %}
  444. diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
  445. --- a/chrome/android/java/res/xml/main_preferences.xml
  446. +++ b/chrome/android/java/res/xml/main_preferences.xml
  447. @@ -7,29 +7,11 @@
  448. xmlns:app="http://schemas.android.com/apk/res-auto"
  449. android:orderingFromXml="false">
  450. - <org.chromium.chrome.browser.sync.settings.SyncPromoPreference
  451. - android:key="sync_promo"
  452. - android:order="0"/>
  453. <PreferenceCategory
  454. android:key="account_and_google_services_section"
  455. android:order="1"
  456. - android:title="@string/prefs_section_account_and_google_services"/>
  457. - <org.chromium.chrome.browser.sync.settings.SignInPreference
  458. - android:key="sign_in"
  459. - android:order="2"
  460. - android:title="@string/sign_in_to_chrome"/>
  461. - <org.chromium.components.browser_ui.settings.ChromeBasePreference
  462. - android:key="manage_sync"
  463. - android:order="3"
  464. - android:layout="@layout/account_management_account_row"
  465. - android:title="@string/sync_category_title"/>
  466. - <org.chromium.components.browser_ui.settings.ChromeBasePreference
  467. - android:key="google_services"
  468. - android:order="4"
  469. - android:layout="@layout/account_management_account_row"
  470. - android:title="@string/prefs_google_services"
  471. - android:icon="@drawable/ic_google_services_48dp"
  472. - android:fragment="org.chromium.chrome.browser.sync.settings.GoogleServicesSettings"/>
  473. + android:title="@string/prefs_section_account_and_google_services"
  474. + app:isPreferenceVisible="false" />
  475. <PreferenceCategory
  476. android:key="basics_section"
  477. @@ -99,11 +81,6 @@
  478. android:key="languages"
  479. android:order="19"
  480. android:title="@string/language_settings"/>
  481. - <org.chromium.components.browser_ui.settings.ChromeBasePreference
  482. - android:fragment="org.chromium.chrome.browser.datareduction.settings.DataReductionPreferenceFragment"
  483. - android:key="data_reduction"
  484. - android:order="20"
  485. - android:title="@string/data_reduction_title_lite_mode"/>
  486. <org.chromium.components.browser_ui.settings.ChromeBasePreference
  487. android:fragment="org.chromium.chrome.browser.download.settings.DownloadSettings"
  488. android:key="downloads"
  489. diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
  490. --- a/chrome/android/java/res/xml/privacy_preferences.xml
  491. +++ b/chrome/android/java/res/xml/privacy_preferences.xml
  492. @@ -40,8 +40,4 @@
  493. android:key="privacy_sandbox"
  494. android:title="@string/prefs_privacy_sandbox"
  495. android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"/>
  496. - <org.chromium.components.browser_ui.settings.TextMessagePreference
  497. - android:key="sync_and_services_link"
  498. - android:summary="@string/privacy_sync_and_services_link_legacy"
  499. - app:allowDividerBelow="false"/>
  500. </PreferenceScreen>
  501. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  502. --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  503. +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  504. @@ -36,7 +36,6 @@ import org.chromium.chrome.browser.policy.PolicyAuditor;
  505. import org.chromium.chrome.browser.rlz.RevenueStats;
  506. import org.chromium.chrome.browser.signin.ui.GoogleActivityController;
  507. import org.chromium.chrome.browser.survey.SurveyController;
  508. -import org.chromium.chrome.browser.sync.TrustedVaultClient;
  509. import org.chromium.chrome.browser.tab.Tab;
  510. import org.chromium.chrome.browser.usage_stats.DigitalWellbeingClient;
  511. import org.chromium.chrome.browser.webapps.GooglePlayWebApkInstallDelegate;
  512. @@ -288,13 +287,6 @@ public abstract class AppHooks {
  513. return ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED;
  514. }
  515. - /**
  516. - * Returns a new {@link TrustedVaultClient.Backend} instance.
  517. - */
  518. - public TrustedVaultClient.Backend createSyncTrustedVaultClientBackend() {
  519. - return new TrustedVaultClient.EmptyBackend();
  520. - }
  521. -
  522. /**
  523. * Returns a new {@link SurfaceRenderer} if the xsurface implementation is included in the
  524. * apk. Otherwise null is returned.
  525. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  526. --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  527. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  528. @@ -87,7 +87,6 @@ import org.chromium.chrome.browser.download.DownloadOpenSource;
  529. import org.chromium.chrome.browser.download.DownloadUtils;
  530. import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
  531. import org.chromium.chrome.browser.feed.FeedSurfaceTracker;
  532. -import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
  533. import org.chromium.chrome.browser.flags.ActivityType;
  534. import org.chromium.chrome.browser.flags.CachedFeatureFlags;
  535. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  536. @@ -103,7 +102,6 @@ import org.chromium.chrome.browser.incognito.IncognitoTabLauncher;
  537. import org.chromium.chrome.browser.incognito.IncognitoTabSnapshotController;
  538. import org.chromium.chrome.browser.incognito.IncognitoUtils;
  539. import org.chromium.chrome.browser.infobar.DataReductionPromoInfoBar;
  540. -import org.chromium.chrome.browser.infobar.SyncErrorInfoBar;
  541. import org.chromium.chrome.browser.layouts.LayoutStateProvider;
  542. import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
  543. import org.chromium.chrome.browser.locale.LocaleManager;
  544. @@ -643,9 +641,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  545. }
  546. private void refreshSignIn() {
  547. - try (TraceEvent e = TraceEvent.scoped("ChromeTabbedActivity.refreshSignIn")) {
  548. - FirstRunSignInProcessor.start(this);
  549. - }
  550. }
  551. private void setupCompositorContentPreNativeForPhone() {
  552. @@ -1806,7 +1801,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  553. DataReductionPromoInfoBar.maybeLaunchPromoInfoBar(ChromeTabbedActivity.this,
  554. tab.getWebContents(), navigation.getUrl(), tab.isShowingErrorPage(),
  555. navigation.isFragmentNavigation(), navigation.httpStatusCode());
  556. - SyncErrorInfoBar.maybeLaunchSyncErrorInfoBar(tab.getWebContents());
  557. SendTabToSelfAndroidBridge.updateActiveWebContents(tab.getWebContents());
  558. }
  559. }
  560. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  561. --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  562. +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  563. @@ -108,7 +108,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
  564. import org.chromium.chrome.browser.download.items.OfflineContentAggregatorNotificationBridgeUiFactory;
  565. import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
  566. import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
  567. -import org.chromium.chrome.browser.firstrun.ForcedSigninProcessor;
  568. import org.chromium.chrome.browser.flags.ActivityType;
  569. import org.chromium.chrome.browser.flags.CachedFeatureFlags;
  570. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  571. @@ -155,7 +154,6 @@ import org.chromium.chrome.browser.share.ShareDelegate;
  572. import org.chromium.chrome.browser.share.ShareDelegateImpl;
  573. import org.chromium.chrome.browser.share.ShareDelegateSupplier;
  574. import org.chromium.chrome.browser.share.ShareRegistrationCoordinator;
  575. -import org.chromium.chrome.browser.sync.SyncService;
  576. import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  577. import org.chromium.chrome.browser.tab.RequestDesktopUtils;
  578. import org.chromium.chrome.browser.tab.Tab;
  579. @@ -214,8 +212,6 @@ import org.chromium.components.page_info.PageInfoController.OpenedFromSource;
  580. import org.chromium.components.policy.CombinedPolicyProvider;
  581. import org.chromium.components.policy.CombinedPolicyProvider.PolicyChangeListener;
  582. import org.chromium.components.profile_metrics.BrowserProfileType;
  583. -import org.chromium.components.sync.ModelType;
  584. -import org.chromium.components.sync.PassphraseType;
  585. import org.chromium.components.user_prefs.UserPrefs;
  586. import org.chromium.components.webapk.lib.client.WebApkValidator;
  587. import org.chromium.components.webapps.AddToHomescreenCoordinator;
  588. @@ -307,9 +303,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  589. private boolean mRemoveWindowBackgroundDone;
  590. protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler;
  591. - // Observes when sync becomes ready to create the mContextReporter.
  592. - private SyncService.SyncStateChangedListener mSyncStateChangedListener;
  593. -
  594. // The PictureInPictureController is initialized lazily https://crbug.com/729738.
  595. private PictureInPictureController mPictureInPictureController;
  596. @@ -1070,60 +1063,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  597. return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR;
  598. }
  599. - private void createContextReporterIfNeeded() {
  600. - if (!mStarted) return; // Sync state reporting should work only in started state.
  601. - if (mContextReporter != null || getActivityTab() == null) return;
  602. -
  603. - final SyncService syncService = SyncService.get();
  604. -
  605. - if (syncService != null && syncService.isSyncingUrlsWithKeystorePassphrase()) {
  606. - ContextReporter.SelectionReporter controller =
  607. - getContextualSearchManager() != null ? new ContextReporter.SelectionReporter() {
  608. - @Override
  609. - public void enable(Callback<GSAContextDisplaySelection> callback) {
  610. - getContextualSearchManager().enableContextReporting(callback);
  611. - }
  612. -
  613. - @Override
  614. - public void disable() {
  615. - getContextualSearchManager().disableContextReporting();
  616. - }
  617. - } : null;
  618. - mContextReporter = AppHooks.get().createGsaHelper().getContextReporter(
  619. - getActivityTabProvider(), mTabModelSelectorSupplier, controller);
  620. -
  621. - if (mSyncStateChangedListener != null) {
  622. - syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
  623. - mSyncStateChangedListener = null;
  624. - }
  625. -
  626. - return;
  627. - } else {
  628. - reportSyncStatus(syncService);
  629. - }
  630. -
  631. - if (mSyncStateChangedListener == null && syncService != null) {
  632. - mSyncStateChangedListener = () -> createContextReporterIfNeeded();
  633. - syncService.addSyncStateChangedListener(mSyncStateChangedListener);
  634. - }
  635. - }
  636. -
  637. - /**
  638. - * Records an appropriate status via UMA given the current sync status.
  639. - */
  640. - private static void reportSyncStatus(@Nullable SyncService syncService) {
  641. - if (syncService == null || !syncService.isEngineInitialized()) {
  642. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_INITIALIZED);
  643. - } else if (!syncService.getActiveDataTypes().contains(ModelType.TYPED_URLS)) {
  644. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_SYNCING_URLS);
  645. - } else if (syncService.getPassphraseType() != PassphraseType.KEYSTORE_PASSPHRASE
  646. - && syncService.getPassphraseType() != PassphraseType.TRUSTED_VAULT_PASSPHRASE) {
  647. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_KEYSTORE_PASSPHRASE);
  648. - } else {
  649. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_OTHER);
  650. - }
  651. - }
  652. -
  653. @Override
  654. public void onResumeWithNative() {
  655. super.onResumeWithNative();
  656. @@ -1226,14 +1165,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  657. if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
  658. if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect();
  659. }
  660. - if (mSyncStateChangedListener != null) {
  661. - SyncService syncService = SyncService.get();
  662. - if (syncService != null) {
  663. - syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
  664. - }
  665. - mSyncStateChangedListener = null;
  666. - }
  667. - if (mContextReporter != null) mContextReporter.disable();
  668. super.onStopWithNative();
  669. }
  670. @@ -1338,11 +1269,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  671. FontSizePrefs.getInstance().recordUserFontPrefOnStartup();
  672. });
  673. - DeferredStartupHandler.getInstance().addDeferredTask(() -> {
  674. - if (isActivityFinishingOrDestroyed()) return;
  675. - ForcedSigninProcessor.checkCanSignIn(ChromeActivity.this);
  676. - });
  677. -
  678. // GSA connection is not needed on low-end devices because Icing is disabled.
  679. if (!SysUtils.isLowEndDevice()) {
  680. if (isActivityFinishingOrDestroyed()) return;
  681. @@ -1357,7 +1283,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  682. GSAAccountChangeListener.create(AppHooks.get().createGsaHelper());
  683. }
  684. mGSAAccountChangeListener.connect();
  685. - createContextReporterIfNeeded();
  686. });
  687. }
  688. }
  689. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
  690. --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
  691. +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
  692. @@ -19,7 +19,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  693. import org.chromium.chrome.browser.profiles.Profile;
  694. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  695. import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
  696. -import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
  697. import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  698. import org.chromium.components.browser_ui.settings.SettingsLauncher;
  699. import org.chromium.components.browser_ui.settings.SettingsUtils;
  700. @@ -51,7 +50,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
  701. private ChromeSwitchPreference mAutofillAssistantPreference;
  702. private ChromeSwitchPreference mProactiveHelpPreference;
  703. private ChromeSwitchPreference mAssistantVoiceSearchEnabledPref;
  704. - private Preference mGoogleServicesSettingsLink;
  705. @Override
  706. public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  707. @@ -89,15 +87,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
  708. mProactiveHelpPreference.setVisible(false);
  709. }
  710. - mGoogleServicesSettingsLink = findPreference(PREF_GOOGLE_SERVICES_SETTINGS_LINK);
  711. - NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getResources(), view -> {
  712. - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  713. - settingsLauncher.launchSettingsActivity(requireContext(), GoogleServicesSettings.class);
  714. - });
  715. - mGoogleServicesSettingsLink.setSummary(
  716. - SpanApplier.applySpans(getString(R.string.prefs_proactive_help_sync_link),
  717. - new SpanApplier.SpanInfo("<link>", "</link>", linkSpan)));
  718. -
  719. PreferenceCategory assistantVoiceSearchCategory =
  720. findPreference(PREF_ASSISTANT_VOICE_SEARCH_CATEGORY);
  721. mAssistantVoiceSearchEnabledPref =
  722. @@ -165,7 +154,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
  723. }
  724. mProactiveHelpPreference.setEnabled(proactive_toggle_enabled);
  725. mProactiveHelpPreference.setChecked(proactive_toggle_enabled && proactive_help_on);
  726. - mGoogleServicesSettingsLink.setVisible(show_disclaimer);
  727. mAssistantVoiceSearchEnabledPref.setChecked(mSharedPreferencesManager.readBoolean(
  728. ChromePreferenceKeys.ASSISTANT_VOICE_SEARCH_ENABLED, /* default= */ false));
  729. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
  730. --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
  731. +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
  732. @@ -25,8 +25,6 @@ import org.chromium.chrome.browser.bookmarks.BookmarkListEntry.ViewType;
  733. import org.chromium.chrome.browser.bookmarks.BookmarkRow.Location;
  734. import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
  735. import org.chromium.chrome.browser.profiles.Profile;
  736. -import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
  737. -import org.chromium.chrome.browser.sync.SyncService;
  738. import org.chromium.components.bookmarks.BookmarkId;
  739. import org.chromium.components.bookmarks.BookmarkType;
  740. import org.chromium.components.browser_ui.widget.dragreorder.DragReorderableListAdapter;
  741. @@ -42,7 +40,7 @@ import java.util.List;
  742. * BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there.
  743. */
  744. class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  745. - implements BookmarkUIObserver, SyncService.SyncStateChangedListener {
  746. + implements BookmarkUIObserver {
  747. private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
  748. private static final String EMPTY_QUERY = null;
  749. @@ -53,10 +51,8 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  750. @ViewType
  751. private int mPromoHeaderType = ViewType.INVALID;
  752. private BookmarkDelegate mDelegate;
  753. - private BookmarkPromoHeader mPromoHeaderManager;
  754. private String mSearchText;
  755. private BookmarkId mCurrentFolder;
  756. - private SyncService mSyncService;
  757. // Keep track of the currently highlighted bookmark - used for "show in folder" action.
  758. private BookmarkId mHighlightedBookmark;
  759. @@ -109,8 +105,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  760. BookmarkItemsAdapter(Context context) {
  761. super(context);
  762. - mSyncService = SyncService.get();
  763. - mSyncService.addSyncStateChangedListener(this);
  764. }
  765. /**
  766. @@ -185,9 +179,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  767. case ViewType.PERSONALIZED_SIGNIN_PROMO:
  768. // fall through
  769. case ViewType.PERSONALIZED_SYNC_PROMO:
  770. - return mPromoHeaderManager.createPersonalizedSigninAndSyncPromoHolder(parent);
  771. + return null;
  772. case ViewType.SYNC_PROMO:
  773. - return mPromoHeaderManager.createSyncPromoHolder(parent);
  774. + return null;
  775. case ViewType.SECTION_HEADER:
  776. return createSectionHeaderViewHolder(parent, viewType);
  777. case ViewType.FOLDER:
  778. @@ -208,10 +202,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  779. public void onBindViewHolder(ViewHolder holder, int position) {
  780. if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO
  781. || holder.getItemViewType() == ViewType.PERSONALIZED_SYNC_PROMO) {
  782. - PersonalizedSigninPromoView view =
  783. - (PersonalizedSigninPromoView) holder.itemView.findViewById(
  784. - R.id.signin_promo_view_container);
  785. - mPromoHeaderManager.setUpSyncPromoView(view);
  786. } else if (holder.getItemViewType() == ViewType.SECTION_HEADER) {
  787. bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position));
  788. } else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) {
  789. @@ -266,7 +256,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  790. case ViewType.PERSONALIZED_SIGNIN_PROMO:
  791. // fall through
  792. case ViewType.PERSONALIZED_SYNC_PROMO:
  793. - mPromoHeaderManager.detachPersonalizePromoView();
  794. break;
  795. default:
  796. // Other view holders don't have special recycling code.
  797. @@ -292,7 +281,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  798. updateHeader(!topLevelFoldersShowing());
  799. };
  800. - mPromoHeaderManager = new BookmarkPromoHeader(mContext, promoHeaderChangeAction);
  801. populateTopLevelFoldersList();
  802. mElements = new ArrayList<>();
  803. @@ -307,8 +295,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  804. mDelegate.getModel().removeObserver(mBookmarkModelObserver);
  805. mDelegate.getSelectionDelegate().removeObserver(this);
  806. mDelegate = null;
  807. - mPromoHeaderManager.destroy();
  808. - mSyncService.removeSyncStateChangedListener(this);
  809. }
  810. @Override
  811. @@ -399,18 +385,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  812. setOrder(mElements);
  813. }
  814. - // SyncStateChangedListener implementation.
  815. - @Override
  816. - public void syncStateChanged() {
  817. - // If mDelegate is null, we will set the top level folders upon its initialization
  818. - // (see onBookmarkDelegateInitialized method above).
  819. - if (mDelegate == null) {
  820. - return;
  821. - }
  822. - mTopLevelFolders.clear();
  823. - populateTopLevelFoldersList();
  824. - }
  825. -
  826. /**
  827. * Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the
  828. * promo header. This 0th index is null iff there is a promo header.
  829. @@ -430,23 +404,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  830. return;
  831. } else if (currentUIState == BookmarkUIState.STATE_SEARCHING) {
  832. mPromoHeaderType = ViewType.INVALID;
  833. - } else {
  834. - switch (mPromoHeaderManager.getPromoState()) {
  835. - case BookmarkPromoHeader.PromoState.PROMO_NONE:
  836. - mPromoHeaderType = ViewType.INVALID;
  837. - break;
  838. - case BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED:
  839. - mPromoHeaderType = ViewType.PERSONALIZED_SIGNIN_PROMO;
  840. - break;
  841. - case BookmarkPromoHeader.PromoState.PROMO_SYNC_PERSONALIZED:
  842. - mPromoHeaderType = ViewType.PERSONALIZED_SYNC_PROMO;
  843. - break;
  844. - case BookmarkPromoHeader.PromoState.PROMO_SYNC:
  845. - mPromoHeaderType = ViewType.SYNC_PROMO;
  846. - break;
  847. - default:
  848. - assert false : "Unexpected value for promo state!";
  849. - }
  850. }
  851. boolean willShowPromo = hasPromoHeader();
  852. @@ -569,7 +526,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  853. @VisibleForTesting
  854. void simulateSignInForTests() {
  855. - syncStateChanged();
  856. onFolderStateSet(mCurrentFolder);
  857. }
  858. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
  859. --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
  860. +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
  861. @@ -19,20 +19,6 @@ import org.chromium.chrome.R;
  862. import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  863. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  864. import org.chromium.chrome.browser.profiles.Profile;
  865. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  866. -import org.chromium.chrome.browser.signin.SyncPromoView;
  867. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  868. -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
  869. -import org.chromium.chrome.browser.signin.services.SigninManager;
  870. -import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
  871. -import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
  872. -import org.chromium.chrome.browser.signin.ui.SigninPromoController;
  873. -import org.chromium.chrome.browser.sync.SyncService;
  874. -import org.chromium.components.signin.AccountManagerFacade;
  875. -import org.chromium.components.signin.AccountManagerFacadeProvider;
  876. -import org.chromium.components.signin.AccountsChangeObserver;
  877. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  878. -import org.chromium.components.signin.metrics.SigninAccessPoint;
  879. import java.lang.annotation.Retention;
  880. import java.lang.annotation.RetentionPolicy;
  881. @@ -41,8 +27,7 @@ import java.lang.annotation.RetentionPolicy;
  882. * Class that manages all the logic and UI behind the signin promo header in the bookmark
  883. * content UI. The header is shown only on certain situations, (e.g., not signed in).
  884. */
  885. -class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignInStateObserver,
  886. - ProfileDataCache.Observer, AccountsChangeObserver {
  887. +class BookmarkPromoHeader {
  888. /**
  889. * Specifies the various states in which the Bookmarks promo can be.
  890. */
  891. @@ -62,14 +47,9 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
  892. private static @Nullable @PromoState Integer sPromoStateForTests;
  893. private final Context mContext;
  894. - private final SigninManager mSignInManager;
  895. - private final AccountManagerFacade mAccountManagerFacade;
  896. private final Runnable mPromoHeaderChangeAction;
  897. - private @Nullable ProfileDataCache mProfileDataCache;
  898. - private final @Nullable SigninPromoController mSigninPromoController;
  899. private @PromoState int mPromoState;
  900. - private final @Nullable SyncService mSyncService;
  901. /**
  902. * Initializes the class. Note that this will start listening to signin related events and
  903. @@ -79,46 +59,17 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
  904. mContext = context;
  905. mPromoHeaderChangeAction = promoHeaderChangeAction;
  906. - mSyncService = SyncService.get();
  907. - if (mSyncService != null) mSyncService.addSyncStateChangedListener(this);
  908. -
  909. - mSignInManager = IdentityServicesProvider.get().getSigninManager(
  910. - Profile.getLastUsedRegularProfile());
  911. - mSignInManager.addSignInStateObserver(this);
  912. -
  913. - mAccountManagerFacade = AccountManagerFacadeProvider.getInstance();
  914. -
  915. mPromoState = calculatePromoState();
  916. if (mPromoState == PromoState.PROMO_SYNC) {
  917. SharedPreferencesManager.getInstance().incrementInt(
  918. ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT);
  919. }
  920. -
  921. - if (SigninPromoController.canShowSyncPromo(SigninAccessPoint.BOOKMARK_MANAGER)) {
  922. - mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(mContext);
  923. - mProfileDataCache.addObserver(this);
  924. - mSigninPromoController = new SigninPromoController(
  925. - SigninAccessPoint.BOOKMARK_MANAGER, SyncConsentActivityLauncherImpl.get());
  926. - mAccountManagerFacade.addObserver(this);
  927. - } else {
  928. - mProfileDataCache = null;
  929. - mSigninPromoController = null;
  930. - }
  931. }
  932. /**
  933. * Clean ups the class. Must be called once done using this class.
  934. */
  935. void destroy() {
  936. - if (mSyncService != null) mSyncService.removeSyncStateChangedListener(this);
  937. -
  938. - if (mSigninPromoController != null) {
  939. - mAccountManagerFacade.removeObserver(this);
  940. - mProfileDataCache.removeObserver(this);
  941. - mSigninPromoController.onPromoDestroyed();
  942. - }
  943. -
  944. - mSignInManager.removeSignInStateObserver(this);
  945. }
  946. /**
  947. @@ -129,58 +80,11 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
  948. return mPromoState;
  949. }
  950. - /**
  951. - * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
  952. - * {@link RecyclerView}.
  953. - */
  954. - ViewHolder createPersonalizedSigninAndSyncPromoHolder(ViewGroup parent) {
  955. - View view = LayoutInflater.from(mContext).inflate(
  956. - R.layout.personalized_signin_promo_view_bookmarks, parent, false);
  957. -
  958. - // ViewHolder is abstract and it cannot be instantiated directly.
  959. - return new ViewHolder(view) {};
  960. - }
  961. -
  962. - /**
  963. - * @return Sync promo header {@link ViewHolder} instance that can be used with
  964. - * {@link RecyclerView}.
  965. - */
  966. - ViewHolder createSyncPromoHolder(ViewGroup parent) {
  967. - SyncPromoView view = SyncPromoView.create(parent, SigninAccessPoint.BOOKMARK_MANAGER);
  968. -
  969. - // ViewHolder is abstract and it cannot be instantiated directly.
  970. - return new ViewHolder(view) {};
  971. - }
  972. -
  973. - /**
  974. - * Sets up the sync promo view.
  975. - */
  976. - void setUpSyncPromoView(PersonalizedSigninPromoView view) {
  977. - mSigninPromoController.setUpSyncPromoView(
  978. - mProfileDataCache, view, this::setPersonalizedSigninPromoDeclined);
  979. - }
  980. -
  981. - /**
  982. - * Detaches the previously configured {@link PersonalizedSigninPromoView}.
  983. - */
  984. - void detachPersonalizePromoView() {
  985. - if (mSigninPromoController != null) mSigninPromoController.detach();
  986. - }
  987. -
  988. - /**
  989. - * Saves that the personalized signin promo was declined and updates the UI.
  990. - */
  991. - private void setPersonalizedSigninPromoDeclined() {
  992. - mPromoState = calculatePromoState();
  993. - triggerPromoUpdate();
  994. - }
  995. -
  996. /**
  997. * @return Whether the personalized signin promo should be shown to user.
  998. */
  999. private boolean shouldShowBookmarkSigninPromo() {
  1000. - return mSignInManager.isSignInAllowed()
  1001. - && SigninPromoController.canShowSyncPromo(SigninAccessPoint.BOOKMARK_MANAGER);
  1002. + return false;
  1003. }
  1004. private @PromoState int calculatePromoState() {
  1005. @@ -188,70 +92,10 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
  1006. return sPromoStateForTests;
  1007. }
  1008. - if (mSyncService == null) {
  1009. - // |mSyncService| will remain null until the next browser startup, so no sense in
  1010. - // offering any promo.
  1011. - return PromoState.PROMO_NONE;
  1012. - }
  1013. -
  1014. - if (!mSyncService.isSyncAllowedByPlatform()) {
  1015. - return PromoState.PROMO_NONE;
  1016. - }
  1017. -
  1018. - if (!mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC)) {
  1019. - if (!shouldShowBookmarkSigninPromo()) {
  1020. - return PromoState.PROMO_NONE;
  1021. - }
  1022. -
  1023. - return mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SIGNIN)
  1024. - ? PromoState.PROMO_SYNC_PERSONALIZED
  1025. - : PromoState.PROMO_SIGNIN_PERSONALIZED;
  1026. - }
  1027. -
  1028. - boolean impressionLimitNotReached =
  1029. - SharedPreferencesManager.getInstance().readInt(
  1030. - ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT)
  1031. - < MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT;
  1032. - if (!mSyncService.isSyncRequested() && impressionLimitNotReached) {
  1033. - return PromoState.PROMO_SYNC;
  1034. - }
  1035. return PromoState.PROMO_NONE;
  1036. }
  1037. - // SyncService.SyncStateChangedListener implementation.
  1038. - @Override
  1039. - public void syncStateChanged() {
  1040. - mPromoState = calculatePromoState();
  1041. - triggerPromoUpdate();
  1042. - }
  1043. -
  1044. - // SignInStateObserver implementation.
  1045. - @Override
  1046. - public void onSignedIn() {
  1047. - mPromoState = calculatePromoState();
  1048. - triggerPromoUpdate();
  1049. - }
  1050. -
  1051. - @Override
  1052. - public void onSignedOut() {
  1053. - mPromoState = calculatePromoState();
  1054. - triggerPromoUpdate();
  1055. - }
  1056. -
  1057. - // ProfileDataCache.Observer implementation.
  1058. - @Override
  1059. - public void onProfileDataUpdated(String accountEmail) {
  1060. - triggerPromoUpdate();
  1061. - }
  1062. -
  1063. - // AccountsChangeObserver implementation.
  1064. - @Override
  1065. - public void onAccountsChanged() {
  1066. - triggerPromoUpdate();
  1067. - }
  1068. -
  1069. private void triggerPromoUpdate() {
  1070. - detachPersonalizePromoView();
  1071. mPromoHeaderChangeAction.run();
  1072. }
  1073. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
  1074. --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
  1075. +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
  1076. @@ -24,7 +24,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  1077. import org.chromium.chrome.browser.profiles.Profile;
  1078. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  1079. import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1080. -import org.chromium.chrome.browser.sync.SyncService;
  1081. import org.chromium.chrome.browser.tab.TabLaunchType;
  1082. import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
  1083. import org.chromium.components.browser_ui.settings.ClickableSpansTextMessagePreference;
  1084. @@ -207,9 +206,7 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment {
  1085. }
  1086. private boolean isHistorySyncEnabled() {
  1087. - SyncService syncService = SyncService.get();
  1088. - return syncService != null && syncService.isSyncRequested()
  1089. - && syncService.getActiveDataTypes().contains(ModelType.HISTORY_DELETE_DIRECTIVES);
  1090. + return false;
  1091. }
  1092. @Override
  1093. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java
  1094. --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java
  1095. +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java
  1096. @@ -16,7 +16,6 @@ import org.chromium.base.metrics.RecordUserAction;
  1097. import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.PanelState;
  1098. import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
  1099. import org.chromium.chrome.browser.contextualsearch.ResolvedSearchTerm.CardTag;
  1100. -import org.chromium.chrome.browser.sync.SyncService;
  1101. import java.lang.annotation.Retention;
  1102. import java.lang.annotation.RetentionPolicy;
  1103. @@ -882,10 +881,6 @@ public class ContextualSearchUma {
  1104. public static void logTapResultsSeen(boolean wasPanelSeen) {
  1105. RecordHistogram.recordBooleanHistogram(
  1106. "Search.ContextualSearch.Tap.ResultsSeen", wasPanelSeen);
  1107. - if (SyncService.get() != null && SyncService.get().isSyncRequested()) {
  1108. - RecordHistogram.recordBooleanHistogram(
  1109. - "Search.ContextualSearch.Tap.SyncEnabled.ResultsSeen", wasPanelSeen);
  1110. - }
  1111. }
  1112. /**
  1113. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
  1114. --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
  1115. +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
  1116. @@ -35,7 +35,6 @@ import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntent
  1117. import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider.CustomTabsUiType;
  1118. import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
  1119. import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
  1120. -import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
  1121. import org.chromium.chrome.browser.flags.AllCachedFieldTrialParameters;
  1122. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  1123. import org.chromium.chrome.browser.fonts.FontPreloader;
  1124. @@ -142,8 +141,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
  1125. @Override
  1126. public void finishNativeInitialization() {
  1127. - if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
  1128. -
  1129. mConnection.showSignInToastIfNecessary(mSession, getIntent());
  1130. new CustomTabTrustedCdnPublisherUrlVisibility(
  1131. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
  1132. --- a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
  1133. +++ b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
  1134. @@ -56,10 +56,10 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
  1135. public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  1136. SettingsUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
  1137. getActivity().setTitle(R.string.data_reduction_title_lite_mode);
  1138. - boolean isEnabled = DataReductionProxySettings.getInstance().isDataReductionProxyEnabled();
  1139. - mIsEnabled = !isEnabled;
  1140. - mWasEnabledAtCreation = isEnabled;
  1141. - updatePreferences(isEnabled);
  1142. +
  1143. + mIsEnabled = false;
  1144. + mWasEnabledAtCreation = false;
  1145. + updatePreferences(false);
  1146. setHasOptionsMenu(true);
  1147. @@ -175,21 +175,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
  1148. * Returns summary string.
  1149. */
  1150. public static String generateSummary(Resources resources) {
  1151. - if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) {
  1152. - ContentLengths length = DataReductionProxySettings.getInstance().getContentLengths();
  1153. -
  1154. - // If received is less than show chart threshold than don't show summary.
  1155. - if (ConversionUtils.bytesToKilobytes(length.getReceived())
  1156. - < DataReductionProxySettings.DATA_REDUCTION_SHOW_CHART_KB_THRESHOLD) {
  1157. - return "";
  1158. - }
  1159. -
  1160. - String percent = generatePercentSavings(length);
  1161. - return resources.getString(
  1162. - R.string.data_reduction_menu_item_summary_lite_mode, percent);
  1163. - } else {
  1164. - return (String) resources.getText(R.string.text_off);
  1165. - }
  1166. + return (String) resources.getText(R.string.text_off);
  1167. }
  1168. /**
  1169. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
  1170. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
  1171. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
  1172. @@ -27,14 +27,10 @@ import org.chromium.base.metrics.RecordHistogram;
  1173. import org.chromium.base.supplier.Supplier;
  1174. import org.chromium.chrome.R;
  1175. import org.chromium.chrome.browser.customtabs.CustomTabActivity;
  1176. -import org.chromium.chrome.browser.datareduction.DataReductionPromoUtils;
  1177. -import org.chromium.chrome.browser.datareduction.DataReductionProxyUma;
  1178. import org.chromium.chrome.browser.fonts.FontPreloader;
  1179. import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
  1180. import org.chromium.chrome.browser.metrics.UmaUtils;
  1181. -import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  1182. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  1183. -import org.chromium.chrome.browser.signin.SigninFirstRunFragment;
  1184. import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
  1185. import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  1186. import org.chromium.ui.base.LocalizationUtils;
  1187. @@ -104,7 +100,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
  1188. private static final int FRE_PROGRESS_STARTED = 0;
  1189. private static final int FRE_PROGRESS_WELCOME_SHOWN = 1;
  1190. - private static final int FRE_PROGRESS_DATA_SAVER_SHOWN = 2;
  1191. private static final int FRE_PROGRESS_SIGNIN_SHOWN = 3;
  1192. private static final int FRE_PROGRESS_COMPLETED_SIGNED_IN = 4;
  1193. private static final int FRE_PROGRESS_COMPLETED_NOT_SIGNED_IN = 5;
  1194. @@ -155,7 +150,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
  1195. private void createPageSequence() {
  1196. FREMobileIdentityConsistencyFieldTrial.createFirstRunTrial();
  1197. if (FREMobileIdentityConsistencyFieldTrial.isEnabled()) {
  1198. - mPages.add(SigninFirstRunFragment::new);
  1199. } else {
  1200. mPages.add(shouldCreateEnterpriseCctTosPage()
  1201. ? new TosAndUmaFirstRunFragmentWithEnterpriseSupport.Page()
  1202. @@ -189,20 +183,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
  1203. mFirstRunFlowSequencer.onNativeAndPoliciesInitialized(mFreProperties);
  1204. boolean notifyAdapter = false;
  1205. - // An optional sign-in page.
  1206. - if (FREMobileIdentityConsistencyFieldTrial.isEnabled()
  1207. - && mFreProperties.getBoolean(SHOW_SIGNIN_PAGE)) {
  1208. - mPages.add(SyncConsentFirstRunFragment::new);
  1209. - mFreProgressStates.add(FRE_PROGRESS_SIGNIN_SHOWN);
  1210. - notifyAdapter = true;
  1211. - }
  1212. -
  1213. - // An optional Data Saver page.
  1214. - if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
  1215. - mPages.add(new DataReductionProxyFirstRunFragment.Page());
  1216. - mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
  1217. - notifyAdapter = true;
  1218. - }
  1219. // An optional page to select a default search engine.
  1220. if (mFreProperties.getBoolean(SHOW_SEARCH_ENGINE_PAGE)) {
  1221. @@ -211,14 +191,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
  1222. notifyAdapter = true;
  1223. }
  1224. - // An optional sign-in page.
  1225. - if (!FREMobileIdentityConsistencyFieldTrial.isEnabled()
  1226. - && mFreProperties.getBoolean(SHOW_SIGNIN_PAGE)) {
  1227. - mPages.add(SyncConsentFirstRunFragment::new);
  1228. - mFreProgressStates.add(FRE_PROGRESS_SIGNIN_SHOWN);
  1229. - notifyAdapter = true;
  1230. - }
  1231. -
  1232. if (notifyAdapter && mPagerAdapter != null) {
  1233. mPagerAdapter.notifyDataSetChanged();
  1234. }
  1235. @@ -489,18 +461,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
  1236. FirstRunFlowSequencer.markFlowAsCompleted(
  1237. mResultSignInAccountName, mResultShowSignInSettings);
  1238. - if (DataReductionPromoUtils.getDisplayedFreOrSecondRunPromo()) {
  1239. - if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) {
  1240. - DataReductionProxyUma
  1241. - .dataReductionProxyUIAction(DataReductionProxyUma.ACTION_FRE_ENABLED);
  1242. - DataReductionPromoUtils.saveFrePromoOptOut(false);
  1243. - } else {
  1244. - DataReductionProxyUma
  1245. - .dataReductionProxyUIAction(DataReductionProxyUma.ACTION_FRE_DISABLED);
  1246. - DataReductionPromoUtils.saveFrePromoOptOut(true);
  1247. - }
  1248. - }
  1249. -
  1250. if (sObserver != null) sObserver.onUpdateCachedEngineName(this);
  1251. launchPendingIntentAndFinish();
  1252. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
  1253. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
  1254. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
  1255. @@ -96,10 +96,7 @@ public abstract class FirstRunFlowSequencer {
  1256. @VisibleForTesting
  1257. protected boolean isSyncAllowed() {
  1258. - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
  1259. - Profile.getLastUsedRegularProfile());
  1260. - return FirstRunUtils.canAllowSync() && !signinManager.isSigninDisabledByPolicy()
  1261. - && signinManager.isSigninSupported();
  1262. + return false;
  1263. }
  1264. @VisibleForTesting
  1265. @@ -114,11 +111,6 @@ public abstract class FirstRunFlowSequencer {
  1266. return FirstRunUtils.isFirstRunEulaAccepted();
  1267. }
  1268. - protected boolean shouldShowDataReductionPage() {
  1269. - return !DataReductionProxySettings.getInstance().isDataReductionProxyManaged()
  1270. - && DataReductionProxySettings.getInstance().isDataReductionProxyFREPromoAllowed();
  1271. - }
  1272. -
  1273. @VisibleForTesting
  1274. protected boolean shouldShowSearchEnginePage() {
  1275. @SearchEnginePromoType
  1276. @@ -129,7 +121,6 @@ public abstract class FirstRunFlowSequencer {
  1277. @VisibleForTesting
  1278. protected void setFirstRunFlowSignInComplete() {
  1279. - FirstRunSignInProcessor.setFirstRunFlowSignInComplete(true);
  1280. }
  1281. @VisibleForTesting
  1282. @@ -140,13 +131,6 @@ public abstract class FirstRunFlowSequencer {
  1283. }
  1284. void processFreEnvironmentPreNative() {
  1285. - Bundle freProperties = new Bundle();
  1286. - freProperties.putInt(SyncConsentFirstRunFragment.CHILD_ACCOUNT_STATUS, mChildAccountStatus);
  1287. -
  1288. - onFlowIsKnown(freProperties);
  1289. - if (ChildAccountStatus.isChild(mChildAccountStatus)) {
  1290. - setFirstRunFlowSignInComplete();
  1291. - }
  1292. }
  1293. /**
  1294. @@ -155,16 +139,6 @@ public abstract class FirstRunFlowSequencer {
  1295. * @param freProperties Resulting FRE properties bundle.
  1296. */
  1297. public void onNativeAndPoliciesInitialized(Bundle freProperties) {
  1298. - // We show the sign-in page if sync is allowed, and not signed in, and
  1299. - // - no "skip the first use hints" is set, or
  1300. - // - "skip the first use hints" is set, but there is at least one account.
  1301. - boolean offerSignInOk = isSyncAllowed() && !isSignedIn()
  1302. - && (!shouldSkipFirstUseHints() || !mGoogleAccounts.isEmpty());
  1303. - freProperties.putBoolean(FirstRunActivity.SHOW_SIGNIN_PAGE, offerSignInOk);
  1304. - freProperties.putBoolean(
  1305. - FirstRunActivity.SHOW_DATA_REDUCTION_PAGE, shouldShowDataReductionPage());
  1306. - freProperties.putBoolean(
  1307. - FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE, shouldShowSearchEnginePage());
  1308. }
  1309. /**
  1310. @@ -178,9 +152,6 @@ public abstract class FirstRunFlowSequencer {
  1311. if (!FirstRunUtils.isFirstRunEulaAccepted()) {
  1312. FirstRunUtils.setEulaAccepted();
  1313. }
  1314. -
  1315. - // Mark the FRE flow as complete and set the sign-in flow preferences if necessary.
  1316. - FirstRunSignInProcessor.finalizeFirstRunFlowState(signInAccountName, showSignInSettings);
  1317. }
  1318. /**
  1319. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
  1320. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
  1321. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
  1322. @@ -86,11 +86,7 @@ public class LightweightFirstRunActivity
  1323. return;
  1324. }
  1325. - @ChildAccountStatus.Status
  1326. - int childAccountStatus =
  1327. - freProperties.getInt(SyncConsentFirstRunFragment.CHILD_ACCOUNT_STATUS,
  1328. - ChildAccountStatus.NOT_CHILD);
  1329. - initializeViews(ChildAccountStatus.isChild(childAccountStatus));
  1330. + initializeViews(false);
  1331. }
  1332. };
  1333. mFirstRunFlowSequencer.start();
  1334. 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
  1335. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
  1336. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
  1337. @@ -26,7 +26,6 @@ import org.chromium.base.metrics.RecordHistogram;
  1338. import org.chromium.chrome.R;
  1339. import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
  1340. import org.chromium.chrome.browser.version.ChromeVersionInfo;
  1341. -import org.chromium.components.signin.ChildAccountStatus;
  1342. import org.chromium.ui.text.NoUnderlineClickableSpan;
  1343. import org.chromium.ui.text.SpanApplier;
  1344. import org.chromium.ui.text.SpanApplier.SpanInfo;
  1345. @@ -118,19 +117,9 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
  1346. final CharSequence tosText;
  1347. Bundle freProperties = getPageDelegate().getProperties();
  1348. - @ChildAccountStatus.Status
  1349. - int childAccountStatus = freProperties.getInt(
  1350. - SyncConsentFirstRunFragment.CHILD_ACCOUNT_STATUS, ChildAccountStatus.NOT_CHILD);
  1351. - if (childAccountStatus == ChildAccountStatus.REGULAR_CHILD) {
  1352. - tosText = SpanApplier.applySpans(getString(R.string.fre_tos_and_privacy_child_account),
  1353. - new SpanInfo("<LINK1>", "</LINK1>", clickableGoogleTermsSpan),
  1354. - new SpanInfo("<LINK2>", "</LINK2>", clickableChromeAdditionalTermsSpan),
  1355. - new SpanInfo("<LINK3>", "</LINK3>", clickableFamilyLinkPrivacySpan));
  1356. - } else {
  1357. tosText = SpanApplier.applySpans(getString(R.string.fre_tos),
  1358. new SpanInfo("<LINK1>", "</LINK1>", clickableGoogleTermsSpan),
  1359. new SpanInfo("<LINK2>", "</LINK2>", clickableChromeAdditionalTermsSpan));
  1360. - }
  1361. mTosAndPrivacy.setText(tosText);
  1362. // If this page should be skipped, it can be one of the following cases:
  1363. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
  1364. --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
  1365. +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
  1366. @@ -212,11 +212,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
  1367. mHistoryAdapter.generateHeaderItems();
  1368. mHistoryAdapter.generateFooterItems();
  1369. - // Listen to changes in sign in state.
  1370. - IdentityServicesProvider.get()
  1371. - .getSigninManager(Profile.getLastUsedRegularProfile())
  1372. - .addSignInStateObserver(this);
  1373. -
  1374. // Create PrefChangeRegistrar to receive notifications on preference changes.
  1375. mPrefChangeRegistrar = new PrefChangeRegistrar();
  1376. mPrefChangeRegistrar.addObserver(Pref.ALLOW_DELETING_BROWSER_HISTORY, this);
  1377. @@ -250,9 +245,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
  1378. mHistoryAdapter.onDestroyed();
  1379. mLargeIconBridge.destroy();
  1380. mLargeIconBridge = null;
  1381. - IdentityServicesProvider.get()
  1382. - .getSigninManager(Profile.getLastUsedRegularProfile())
  1383. - .removeSignInStateObserver(this);
  1384. mPrefChangeRegistrar.destroy();
  1385. }
  1386. @@ -505,4 +497,4 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
  1387. public static void setScrollToLoadDisabledForTesting(boolean isScrollToLoadDisabled) {
  1388. sIsScrollToLoadDisabledForTests = isScrollToLoadDisabled;
  1389. }
  1390. -}
  1391. \ No newline at end of file
  1392. +}
  1393. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
  1394. --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
  1395. +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
  1396. @@ -34,7 +34,6 @@ import org.chromium.chrome.browser.crash.LogcatExtractionRunnable;
  1397. import org.chromium.chrome.browser.download.DownloadManagerService;
  1398. import org.chromium.chrome.browser.flags.ChromeSwitches;
  1399. import org.chromium.chrome.browser.language.GlobalAppLocaleController;
  1400. -import org.chromium.chrome.browser.signin.SigninCheckerProvider;
  1401. import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
  1402. import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
  1403. import org.chromium.components.crash.browser.ChildProcessCrashObserver;
  1404. @@ -338,7 +337,6 @@ public class ChromeBrowserInitializer {
  1405. LibraryPrefetcher.asyncPrefetchLibrariesToMemory();
  1406. getBrowserStartupController().startBrowserProcessesSync(
  1407. LibraryProcessType.PROCESS_BROWSER, /*singleProcess=*/false);
  1408. - SigninCheckerProvider.get();
  1409. } finally {
  1410. TraceEvent.end("ChromeBrowserInitializer.startChromeBrowserProcessesSync");
  1411. }
  1412. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
  1413. --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
  1414. +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
  1415. @@ -59,7 +59,6 @@ import org.chromium.chrome.browser.media.MediaViewerUtils;
  1416. import org.chromium.chrome.browser.metrics.LaunchMetrics;
  1417. import org.chromium.chrome.browser.metrics.PackageMetrics;
  1418. import org.chromium.chrome.browser.metrics.WebApkUninstallUmaTracker;
  1419. -import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  1420. import org.chromium.chrome.browser.notifications.channels.ChannelsUpdater;
  1421. import org.chromium.chrome.browser.offlinepages.measurements.OfflineMeasurementsBackgroundTask;
  1422. import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
  1423. @@ -74,7 +73,6 @@ import org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidg
  1424. import org.chromium.chrome.browser.rlz.RevenueStats;
  1425. import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
  1426. import org.chromium.chrome.browser.sharing.shared_clipboard.SharedClipboardShareActivity;
  1427. -import org.chromium.chrome.browser.signin.SigninCheckerProvider;
  1428. import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData;
  1429. import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager;
  1430. import org.chromium.chrome.browser.util.AfterStartupTaskUtils;
  1431. @@ -207,7 +205,6 @@ public class ProcessInitializationHandler {
  1432. * Performs the post native initialization.
  1433. */
  1434. protected void handlePostNativeInitialization() {
  1435. - DataReductionProxySettings.handlePostNativeInitialization();
  1436. ChromeActivitySessionTracker.getInstance().initializeWithNative();
  1437. ProfileManagerUtils.removeSessionCookiesForAllProfiles();
  1438. AppBannerManager.setAppDetailsDelegate(AppHooks.get().createAppDetailsDelegate());
  1439. @@ -356,7 +353,6 @@ public class ProcessInitializationHandler {
  1440. deferredStartupHandler.addDeferredTask(new Runnable() {
  1441. @Override
  1442. public void run() {
  1443. - SigninCheckerProvider.get().onMainActivityStart();
  1444. RevenueStats.getInstance();
  1445. }
  1446. });
  1447. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
  1448. --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
  1449. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
  1450. @@ -16,14 +16,10 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager;
  1451. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
  1452. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
  1453. import org.chromium.chrome.browser.profiles.Profile;
  1454. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  1455. import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1456. -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
  1457. import org.chromium.chrome.browser.signin.services.SigninManager;
  1458. import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
  1459. import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
  1460. -import org.chromium.chrome.browser.signin.ui.SigninPromoController;
  1461. -import org.chromium.chrome.browser.sync.SyncService;
  1462. import org.chromium.chrome.browser.tab.Tab;
  1463. import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
  1464. import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
  1465. @@ -42,8 +38,8 @@ import java.util.List;
  1466. /**
  1467. * Provides the domain logic and data for RecentTabsPage and RecentTabsRowAdapter.
  1468. */
  1469. -public class RecentTabsManager implements SyncService.SyncStateChangedListener, SignInStateObserver,
  1470. - ProfileDataCache.Observer, AccountsChangeObserver {
  1471. +public class RecentTabsManager implements SignInStateObserver,
  1472. + AccountsChangeObserver {
  1473. /**
  1474. * Implement this to receive updates when the page contents change.
  1475. */
  1476. @@ -77,15 +73,9 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  1477. private List<RecentlyClosedTab> mRecentlyClosedTabs;
  1478. private RecentTabsPagePrefs mPrefs;
  1479. private RecentlyClosedTabManager mRecentlyClosedTabManager;
  1480. - private SigninManager mSignInManager;
  1481. private UpdatedCallback mUpdatedCallback;
  1482. private boolean mIsDestroyed;
  1483. - private final ProfileDataCache mProfileDataCache;
  1484. - private final SigninPromoController mSigninPromoController;
  1485. - @Nullable
  1486. - private final SyncService mSyncService;
  1487. -
  1488. /**
  1489. * Create an RecentTabsManager to be used with RecentTabsPage and RecentTabsRowAdapter.
  1490. *
  1491. @@ -105,12 +95,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  1492. mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null
  1493. ? sRecentlyClosedTabManagerForTests
  1494. : new RecentlyClosedBridge(profile);
  1495. - mSignInManager = IdentityServicesProvider.get().getSigninManager(mProfile);
  1496. -
  1497. - mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(context);
  1498. - mSigninPromoController = new SigninPromoController(
  1499. - SigninAccessPoint.RECENT_TABS, SyncConsentActivityLauncherImpl.get());
  1500. - mSyncService = SyncService.get();
  1501. mRecentlyClosedTabManager.setTabsUpdatedRunnable(() -> {
  1502. updateRecentlyClosedTabs();
  1503. @@ -131,14 +115,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  1504. */
  1505. public void destroy() {
  1506. mIsDestroyed = true;
  1507. - if (mSyncService != null) {
  1508. - mSyncService.removeSyncStateChangedListener(this);
  1509. - }
  1510. -
  1511. - mSignInManager.removeSignInStateObserver(this);
  1512. - mSignInManager = null;
  1513. -
  1514. - mProfileDataCache.removeObserver(this);
  1515. AccountManagerFacadeProvider.getInstance().removeObserver(this);
  1516. mFaviconHelper.destroy();
  1517. @@ -167,13 +143,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  1518. }
  1519. private void registerObservers() {
  1520. - if (mSyncService != null) {
  1521. - mSyncService.addSyncStateChangedListener(this);
  1522. - }
  1523. -
  1524. - mSignInManager.addSignInStateObserver(this);
  1525. -
  1526. - mProfileDataCache.addObserver(this);
  1527. AccountManagerFacadeProvider.getInstance().addObserver(this);
  1528. }
  1529. @@ -367,33 +336,13 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  1530. */
  1531. @PromoState
  1532. int getPromoType() {
  1533. - if (!mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC)) {
  1534. - if (!mSignInManager.isSignInAllowed()) {
  1535. - return PromoState.PROMO_NONE;
  1536. - }
  1537. - if (mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SIGNIN)) {
  1538. - return PromoState.PROMO_SYNC_PERSONALIZED;
  1539. - }
  1540. - return PromoState.PROMO_SIGNIN_PERSONALIZED;
  1541. - }
  1542. -
  1543. - if (mSyncService == null) {
  1544. - // |mSyncService| will remain null until the next browser startup, so no sense in
  1545. - // offering any promo.
  1546. - return PromoState.PROMO_NONE;
  1547. - }
  1548. -
  1549. - if (mSyncService.isSyncRequested() && !mForeignSessions.isEmpty()) {
  1550. - return PromoState.PROMO_NONE;
  1551. - }
  1552. - return PromoState.PROMO_SYNC;
  1553. + return PromoState.PROMO_NONE;
  1554. }
  1555. /**
  1556. * Sets up the sync promo view.
  1557. */
  1558. void setUpSyncPromoView(PersonalizedSigninPromoView view) {
  1559. - mSigninPromoController.setUpSyncPromoView(mProfileDataCache, view, null);
  1560. }
  1561. // SignInStateObserver implementation.
  1562. @@ -413,18 +362,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  1563. update();
  1564. }
  1565. - // ProfileDataCache.Observer implementation.
  1566. - @Override
  1567. - public void onProfileDataUpdated(String accountEmail) {
  1568. - update();
  1569. - }
  1570. -
  1571. - // SyncService.SyncStateChangedListener implementation.
  1572. - @Override
  1573. - public void syncStateChanged() {
  1574. - update();
  1575. - }
  1576. -
  1577. private void postUpdate() {
  1578. if (mUpdatedCallback != null) {
  1579. mUpdatedCallback.onUpdated();
  1580. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
  1581. --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
  1582. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
  1583. @@ -30,7 +30,6 @@ import org.chromium.chrome.R;
  1584. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
  1585. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
  1586. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionWindow;
  1587. -import org.chromium.chrome.browser.signin.SyncPromoView;
  1588. import org.chromium.chrome.browser.ui.favicon.FaviconHelper.DefaultFaviconHelper;
  1589. import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
  1590. import org.chromium.chrome.browser.ui.favicon.FaviconUtils;
  1591. @@ -445,8 +444,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
  1592. convertView = layoutInflater.inflate(
  1593. R.layout.personalized_signin_promo_view_recent_tabs, parent, false);
  1594. }
  1595. - mRecentTabsManager.setUpSyncPromoView(
  1596. - convertView.findViewById(R.id.signin_promo_view_container));
  1597. return convertView;
  1598. }
  1599. }
  1600. @@ -487,9 +484,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
  1601. @Override
  1602. View getChildView(
  1603. int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
  1604. - if (convertView == null) {
  1605. - convertView = SyncPromoView.create(parent, SigninAccessPoint.RECENT_TABS);
  1606. - }
  1607. return convertView;
  1608. }
  1609. }
  1610. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
  1611. --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
  1612. +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
  1613. @@ -38,9 +38,6 @@ public abstract class RequestGenerator {
  1614. protected RequestGenerator(Context context) {
  1615. mApplicationContext = context.getApplicationContext();
  1616. - UniqueIdentificationGeneratorFactory.registerGenerator(
  1617. - SettingsSecureBasedIdentificationGenerator.GENERATOR_ID,
  1618. - new SettingsSecureBasedIdentificationGenerator(getContext()), false);
  1619. }
  1620. /**
  1621. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
  1622. --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
  1623. +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
  1624. @@ -11,7 +11,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  1625. import org.chromium.chrome.browser.profiles.Profile;
  1626. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  1627. import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1628. -import org.chromium.chrome.browser.sync.SyncService;
  1629. import org.chromium.components.signin.identitymanager.ConsentLevel;
  1630. import org.chromium.components.signin.identitymanager.IdentityManager;
  1631. import org.chromium.components.sync.ModelType;
  1632. @@ -50,18 +49,6 @@ public class PasswordManagerLauncher {
  1633. }
  1634. public static boolean isSyncingPasswordsWithoutCustomPassphrase() {
  1635. - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
  1636. - Profile.getLastUsedRegularProfile());
  1637. - if (!identityManager.hasPrimaryAccount(ConsentLevel.SYNC)) return false;
  1638. -
  1639. - SyncService syncService = SyncService.get();
  1640. - if (syncService == null
  1641. - || !syncService.getActiveDataTypes().contains(ModelType.PASSWORDS)) {
  1642. - return false;
  1643. - }
  1644. -
  1645. - if (syncService.isUsingExplicitPassphrase()) return false;
  1646. -
  1647. - return true;
  1648. + return false;
  1649. }
  1650. }
  1651. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordEntryViewer.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordEntryViewer.java
  1652. --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordEntryViewer.java
  1653. +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordEntryViewer.java
  1654. @@ -39,7 +39,6 @@ import org.chromium.base.ApiCompatibilityUtils;
  1655. import org.chromium.base.metrics.RecordHistogram;
  1656. import org.chromium.chrome.R;
  1657. import org.chromium.chrome.browser.password_manager.ReauthResult;
  1658. -import org.chromium.chrome.browser.sync.SyncService;
  1659. import org.chromium.components.browser_ui.settings.SettingsUtils;
  1660. import org.chromium.ui.text.SpanApplier;
  1661. import org.chromium.ui.widget.Toast;
  1662. @@ -216,9 +215,7 @@ public class PasswordEntryViewer
  1663. }
  1664. private boolean isPasswordSyncingUser() {
  1665. - SyncService syncService = SyncService.get();
  1666. - return syncService != null && syncService.isSyncRequested()
  1667. - && syncService.isEngineInitialized() && !syncService.isUsingExplicitPassphrase();
  1668. + return false;
  1669. }
  1670. @Override
  1671. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
  1672. --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
  1673. +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
  1674. @@ -40,8 +40,6 @@ import org.chromium.chrome.browser.preferences.Pref;
  1675. import org.chromium.chrome.browser.profiles.Profile;
  1676. import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
  1677. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  1678. -import org.chromium.chrome.browser.sync.SyncService;
  1679. -import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
  1680. import org.chromium.chrome.browser.webauthn.CableAuthenticatorModuleProvider;
  1681. import org.chromium.components.browser_ui.settings.ChromeBasePreference;
  1682. import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  1683. @@ -60,8 +58,7 @@ import java.util.Locale;
  1684. * to view saved passwords (just the username and URL), and to delete saved passwords.
  1685. */
  1686. public class PasswordSettings extends PreferenceFragmentCompat
  1687. - implements PasswordManagerHandler.PasswordListObserver,
  1688. - Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener {
  1689. + implements PasswordManagerHandler.PasswordListObserver, Preference.OnPreferenceClickListener {
  1690. // Keys for name/password dictionaries.
  1691. public static final String PASSWORD_LIST_URL = "url";
  1692. public static final String PASSWORD_LIST_NAME = "name";
  1693. @@ -155,10 +152,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
  1694. setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getStyledContext()));
  1695. PasswordManagerHandlerProvider.getInstance().addObserver(this);
  1696. - if (SyncService.get() != null) {
  1697. - SyncService.get().addSyncStateChangedListener(this);
  1698. - }
  1699. -
  1700. setHasOptionsMenu(true); // Password Export might be optional but Search is always present.
  1701. mManagePasswordsReferrer = getReferrerFromInstanceStateOrLaunchBundle(savedInstanceState);
  1702. @@ -189,8 +182,7 @@ public class PasswordSettings extends PreferenceFragmentCompat
  1703. public void onCreate(Bundle savedInstanceState) {
  1704. super.onCreate(savedInstanceState);
  1705. mPasswordCheck = PasswordCheckFactory.getOrCreate(new SettingsLauncherImpl());
  1706. - mShouldShowTrustedVaultOptIn =
  1707. - SyncService.get() != null && SyncService.get().shouldOfferTrustedVaultOptIn();
  1708. + mShouldShowTrustedVaultOptIn = false;
  1709. }
  1710. @Override
  1711. @@ -456,9 +448,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
  1712. public void onDestroy() {
  1713. super.onDestroy();
  1714. - if (SyncService.get() != null) {
  1715. - SyncService.get().removeSyncStateChangedListener(this);
  1716. - }
  1717. // The component should only be destroyed when the activity has been closed by the user
  1718. // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed
  1719. // by the system.
  1720. @@ -570,11 +559,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
  1721. mTrustedVaultOptIn.setOrder(ORDER_TRUSTED_VAULT_OPT_IN);
  1722. mTrustedVaultOptIn.setSummary(R.string.android_trusted_vault_opt_in_sub_label);
  1723. mTrustedVaultOptIn.setOnPreferenceClickListener(preference -> {
  1724. - assert SyncService.get() != null;
  1725. - CoreAccountInfo accountInfo = SyncService.get().getAuthenticatedAccountInfo();
  1726. - assert accountInfo != null;
  1727. - SyncSettingsUtils.openTrustedVaultOptInDialog(
  1728. - this, accountInfo, REQUEST_CODE_TRUSTED_VAULT_OPT_IN);
  1729. // Return true to notify the click was handled.
  1730. return true;
  1731. });
  1732. @@ -632,15 +616,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
  1733. return UserPrefs.get(Profile.getLastUsedRegularProfile());
  1734. }
  1735. - @Override
  1736. - public void syncStateChanged() {
  1737. - boolean shouldShowTrustedVaultOptIn = SyncService.get().shouldOfferTrustedVaultOptIn();
  1738. - if (mShouldShowTrustedVaultOptIn != shouldShowTrustedVaultOptIn) {
  1739. - mShouldShowTrustedVaultOptIn = shouldShowTrustedVaultOptIn;
  1740. - rebuildPasswordLists();
  1741. - }
  1742. - }
  1743. -
  1744. @VisibleForTesting
  1745. Menu getMenuForTesting() {
  1746. return mMenu;
  1747. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
  1748. --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
  1749. +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
  1750. @@ -26,8 +26,6 @@ import org.chromium.chrome.browser.profiles.Profile;
  1751. import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
  1752. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  1753. import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1754. -import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
  1755. -import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
  1756. import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  1757. import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
  1758. import org.chromium.components.browser_ui.settings.SettingsLauncher;
  1759. @@ -48,7 +46,6 @@ public class PrivacySettings
  1760. private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
  1761. private static final String PREF_SECURE_DNS = "secure_dns";
  1762. private static final String PREF_DO_NOT_TRACK = "do_not_track";
  1763. - private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
  1764. private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
  1765. private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
  1766. private static final String PREF_PRIVACY_REVIEW = "privacy_review";
  1767. @@ -105,36 +102,9 @@ public class PrivacySettings
  1768. Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
  1769. secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
  1770. - Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
  1771. - syncAndServicesLink.setSummary(buildSyncAndServicesLink());
  1772. -
  1773. updateSummaries();
  1774. }
  1775. - private SpannableString buildSyncAndServicesLink() {
  1776. - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  1777. - NoUnderlineClickableSpan servicesLink = new NoUnderlineClickableSpan(getResources(), v -> {
  1778. - settingsLauncher.launchSettingsActivity(getActivity(), GoogleServicesSettings.class);
  1779. - });
  1780. - if (IdentityServicesProvider.get()
  1781. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  1782. - .getPrimaryAccountInfo(ConsentLevel.SYNC)
  1783. - == null) {
  1784. - // Sync is off, show the string with one link to "Google Services".
  1785. - return SpanApplier.applySpans(
  1786. - getString(R.string.privacy_sync_and_services_link_sync_off),
  1787. - new SpanApplier.SpanInfo("<link>", "</link>", servicesLink));
  1788. - }
  1789. - // Otherwise, show the string with both links to "Sync" and "Google Services".
  1790. - NoUnderlineClickableSpan syncLink = new NoUnderlineClickableSpan(getResources(), v -> {
  1791. - settingsLauncher.launchSettingsActivity(getActivity(), ManageSyncSettings.class,
  1792. - ManageSyncSettings.createArguments(false));
  1793. - });
  1794. - return SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link_sync_on),
  1795. - new SpanApplier.SpanInfo("<link1>", "</link1>", syncLink),
  1796. - new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
  1797. - }
  1798. -
  1799. @Override
  1800. public boolean onPreferenceChange(Preference preference, Object newValue) {
  1801. String key = preference.getKey();
  1802. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
  1803. --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
  1804. +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
  1805. @@ -19,9 +19,7 @@ import androidx.preference.PreferenceFragmentCompat;
  1806. import org.chromium.base.ContextUtils;
  1807. import org.chromium.chrome.R;
  1808. -import org.chromium.chrome.browser.datareduction.settings.DataReductionPreferenceFragment;
  1809. import org.chromium.chrome.browser.homepage.HomepageManager;
  1810. -import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  1811. import org.chromium.chrome.browser.night_mode.NightModeUtils;
  1812. import org.chromium.chrome.browser.password_check.PasswordCheck;
  1813. import org.chromium.chrome.browser.password_check.PasswordCheckFactory;
  1814. @@ -29,15 +27,6 @@ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  1815. import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  1816. import org.chromium.chrome.browser.profiles.Profile;
  1817. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  1818. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  1819. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1820. -import org.chromium.chrome.browser.signin.services.SigninManager;
  1821. -import org.chromium.chrome.browser.sync.SyncService;
  1822. -import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
  1823. -import org.chromium.chrome.browser.sync.settings.SignInPreference;
  1824. -import org.chromium.chrome.browser.sync.settings.SyncPromoPreference;
  1825. -import org.chromium.chrome.browser.sync.settings.SyncPromoPreference.State;
  1826. -import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
  1827. import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarFeatures;
  1828. import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarStatePredictor;
  1829. import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
  1830. @@ -58,14 +47,10 @@ import java.util.Map;
  1831. * The main settings screen, shown when the user first opens Settings.
  1832. */
  1833. public class MainSettings extends PreferenceFragmentCompat
  1834. - implements TemplateUrlService.LoadListener, SyncService.SyncStateChangedListener,
  1835. - SigninManager.SignInStateObserver {
  1836. - public static final String PREF_SYNC_PROMO = "sync_promo";
  1837. + implements TemplateUrlService.LoadListener {
  1838. public static final String PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION =
  1839. "account_and_google_services_section";
  1840. public static final String PREF_SIGN_IN = "sign_in";
  1841. - public static final String PREF_MANAGE_SYNC = "manage_sync";
  1842. - public static final String PREF_GOOGLE_SERVICES = "google_services";
  1843. public static final String PREF_SEARCH_ENGINE = "search_engine";
  1844. public static final String PREF_PASSWORDS = "passwords";
  1845. public static final String PREF_HOMEPAGE = "homepage";
  1846. @@ -73,7 +58,6 @@ public class MainSettings extends PreferenceFragmentCompat
  1847. public static final String PREF_UI_THEME = "ui_theme";
  1848. public static final String PREF_PRIVACY = "privacy";
  1849. public static final String PREF_SAFETY_CHECK = "safety_check";
  1850. - public static final String PREF_DATA_REDUCTION = "data_reduction";
  1851. public static final String PREF_NOTIFICATIONS = "notifications";
  1852. public static final String PREF_DOWNLOADS = "downloads";
  1853. public static final String PREF_DEVELOPER = "developer";
  1854. @@ -84,9 +68,6 @@ public class MainSettings extends PreferenceFragmentCompat
  1855. private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
  1856. private final Map<String, Preference> mAllPreferences = new HashMap<>();
  1857. - private SyncPromoPreference mSyncPromoPreference;
  1858. - private SignInPreference mSignInPreference;
  1859. - private ChromeBasePreference mManageSync;
  1860. private @Nullable PasswordCheck mPasswordCheck;
  1861. public MainSettings() {
  1862. @@ -117,41 +98,12 @@ public class MainSettings extends PreferenceFragmentCompat
  1863. @Override
  1864. public void onDestroy() {
  1865. super.onDestroy();
  1866. - mSyncPromoPreference.onPreferenceFragmentDestroyed();
  1867. // The component should only be destroyed when the activity has been closed by the user
  1868. // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed
  1869. // by the system.
  1870. if (getActivity().isFinishing() && mPasswordCheck != null) PasswordCheckFactory.destroy();
  1871. }
  1872. - @Override
  1873. - public void onStart() {
  1874. - super.onStart();
  1875. - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
  1876. - Profile.getLastUsedRegularProfile());
  1877. - if (signinManager.isSigninSupported()) {
  1878. - signinManager.addSignInStateObserver(this);
  1879. - }
  1880. - SyncService syncService = SyncService.get();
  1881. - if (syncService != null) {
  1882. - syncService.addSyncStateChangedListener(this);
  1883. - }
  1884. - }
  1885. -
  1886. - @Override
  1887. - public void onStop() {
  1888. - super.onStop();
  1889. - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
  1890. - Profile.getLastUsedRegularProfile());
  1891. - if (signinManager.isSigninSupported()) {
  1892. - signinManager.removeSignInStateObserver(this);
  1893. - }
  1894. - SyncService syncService = SyncService.get();
  1895. - if (syncService != null) {
  1896. - syncService.removeSyncStateChangedListener(this);
  1897. - }
  1898. - }
  1899. -
  1900. @Override
  1901. public void onResume() {
  1902. super.onResume();
  1903. @@ -163,12 +115,9 @@ public class MainSettings extends PreferenceFragmentCompat
  1904. cachePreferences();
  1905. - mSyncPromoPreference.setOnStateChangedCallback(this::onSyncPromoPreferenceStateChanged);
  1906. -
  1907. updatePasswordsPreference();
  1908. setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
  1909. - setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
  1910. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
  1911. // If we are on Android O+ the Notifications preference should lead to the Android
  1912. @@ -213,9 +162,6 @@ public class MainSettings extends PreferenceFragmentCompat
  1913. Preference preference = getPreferenceScreen().getPreference(index);
  1914. mAllPreferences.put(preference.getKey(), preference);
  1915. }
  1916. - mSyncPromoPreference = (SyncPromoPreference) mAllPreferences.get(PREF_SYNC_PROMO);
  1917. - mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
  1918. - mManageSync = (ChromeBasePreference) findPreference(PREF_MANAGE_SYNC);
  1919. }
  1920. private void setManagedPreferenceDelegateForPreference(String key) {
  1921. @@ -224,15 +170,6 @@ public class MainSettings extends PreferenceFragmentCompat
  1922. }
  1923. private void updatePreferences() {
  1924. - if (IdentityServicesProvider.get()
  1925. - .getSigninManager(Profile.getLastUsedRegularProfile())
  1926. - .isSigninSupported()) {
  1927. - addPreferenceIfAbsent(PREF_SIGN_IN);
  1928. - } else {
  1929. - removePreferenceIfPresent(PREF_SIGN_IN);
  1930. - }
  1931. -
  1932. - updateManageSyncPreference();
  1933. updateSearchEnginePreference();
  1934. Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
  1935. @@ -249,10 +186,6 @@ public class MainSettings extends PreferenceFragmentCompat
  1936. } else {
  1937. removePreferenceIfPresent(PREF_DEVELOPER);
  1938. }
  1939. -
  1940. - ChromeBasePreference dataReduction =
  1941. - (ChromeBasePreference) findPreference(PREF_DATA_REDUCTION);
  1942. - dataReduction.setSummary(DataReductionPreferenceFragment.generateSummary(getResources()));
  1943. }
  1944. private Preference addPreferenceIfAbsent(String key) {
  1945. @@ -266,37 +199,6 @@ public class MainSettings extends PreferenceFragmentCompat
  1946. if (preference != null) getPreferenceScreen().removePreference(preference);
  1947. }
  1948. - private void updateManageSyncPreference() {
  1949. - String primaryAccountName = CoreAccountInfo.getEmailFrom(
  1950. - IdentityServicesProvider.get()
  1951. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  1952. - .getPrimaryAccountInfo(ConsentLevel.SIGNIN));
  1953. - boolean showManageSync = primaryAccountName != null;
  1954. - mManageSync.setVisible(showManageSync);
  1955. - if (!showManageSync) return;
  1956. -
  1957. - boolean isSyncConsentAvailable =
  1958. - IdentityServicesProvider.get()
  1959. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  1960. - .getPrimaryAccountInfo(ConsentLevel.SYNC)
  1961. - != null;
  1962. - mManageSync.setIcon(SyncSettingsUtils.getSyncStatusIcon(getActivity()));
  1963. - mManageSync.setSummary(SyncSettingsUtils.getSyncStatusSummary(getActivity()));
  1964. - mManageSync.setOnPreferenceClickListener(pref -> {
  1965. - Context context = getContext();
  1966. - if (SyncService.get().isSyncDisabledByEnterprisePolicy()) {
  1967. - SyncSettingsUtils.showSyncDisabledByAdministratorToast(context);
  1968. - } else if (isSyncConsentAvailable) {
  1969. - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  1970. - settingsLauncher.launchSettingsActivity(context, ManageSyncSettings.class);
  1971. - } else {
  1972. - SyncConsentActivityLauncherImpl.get().launchActivityForPromoDefaultFlow(
  1973. - context, SigninAccessPoint.SETTINGS, primaryAccountName);
  1974. - }
  1975. - return true;
  1976. - });
  1977. - }
  1978. -
  1979. private void updateSearchEnginePreference() {
  1980. if (!TemplateUrlServiceFactory.get().isLoaded()) {
  1981. ChromeBasePreference searchEnginePref =
  1982. @@ -328,28 +230,6 @@ public class MainSettings extends PreferenceFragmentCompat
  1983. pref.setSummary(isOn ? R.string.text_on : R.string.text_off);
  1984. }
  1985. - // SigninManager.SignInStateObserver implementation.
  1986. - @Override
  1987. - public void onSignedIn() {
  1988. - // After signing in or out of a managed account, preferences may change or become enabled
  1989. - // or disabled.
  1990. - new Handler().post(() -> updatePreferences());
  1991. - }
  1992. -
  1993. - @Override
  1994. - public void onSignedOut() {
  1995. - updatePreferences();
  1996. - }
  1997. -
  1998. - private void onSyncPromoPreferenceStateChanged() {
  1999. - // Remove "Account" section header if the personalized sign-in promo is shown.
  2000. - boolean isShowingPersonalizedSigninPromo =
  2001. - mSyncPromoPreference.getState() == State.PERSONALIZED_SIGNIN_PROMO;
  2002. - findPreference(PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION)
  2003. - .setVisible(!isShowingPersonalizedSigninPromo);
  2004. - mSignInPreference.setIsShowingPersonalizedSigninPromo(isShowingPersonalizedSigninPromo);
  2005. - }
  2006. -
  2007. // TemplateUrlService.LoadListener implementation.
  2008. @Override
  2009. public void onTemplateUrlServiceLoaded() {
  2010. @@ -357,11 +237,6 @@ public class MainSettings extends PreferenceFragmentCompat
  2011. updateSearchEnginePreference();
  2012. }
  2013. - @Override
  2014. - public void syncStateChanged() {
  2015. - updateManageSyncPreference();
  2016. - }
  2017. -
  2018. @VisibleForTesting
  2019. public ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
  2020. return mManagedPreferenceDelegate;
  2021. @@ -371,9 +246,6 @@ public class MainSettings extends PreferenceFragmentCompat
  2022. return new ChromeManagedPreferenceDelegate() {
  2023. @Override
  2024. public boolean isPreferenceControlledByPolicy(Preference preference) {
  2025. - if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
  2026. - return DataReductionProxySettings.getInstance().isDataReductionProxyManaged();
  2027. - }
  2028. if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
  2029. return TemplateUrlServiceFactory.get().isDefaultSearchManaged();
  2030. }
  2031. @@ -382,11 +254,6 @@ public class MainSettings extends PreferenceFragmentCompat
  2032. @Override
  2033. public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
  2034. - if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
  2035. - DataReductionProxySettings settings = DataReductionProxySettings.getInstance();
  2036. - return settings.isDataReductionProxyManaged()
  2037. - && !settings.isDataReductionProxyEnabled();
  2038. - }
  2039. if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
  2040. return TemplateUrlServiceFactory.get().isDefaultSearchManaged();
  2041. }
  2042. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
  2043. --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
  2044. +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
  2045. @@ -50,7 +50,6 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckCoordinator;
  2046. import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
  2047. import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl;
  2048. import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
  2049. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  2050. import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
  2051. import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  2052. import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
  2053. @@ -289,9 +288,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
  2054. HelpAndFeedbackLauncherImpl.getInstance());
  2055. }
  2056. if (fragment instanceof SafetyCheckSettingsFragment) {
  2057. - SafetyCheckCoordinator.create((SafetyCheckSettingsFragment) fragment,
  2058. - new SafetyCheckUpdatesDelegateImpl(this), mSettingsLauncher,
  2059. - SyncConsentActivityLauncherImpl.get());
  2060. + // not supported
  2061. }
  2062. if (fragment instanceof PasswordCheckFragmentView) {
  2063. PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment,
  2064. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
  2065. --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
  2066. +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
  2067. @@ -25,7 +25,6 @@ import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
  2068. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  2069. import org.chromium.chrome.browser.share.share_sheet.ShareSheetCoordinator;
  2070. import org.chromium.chrome.browser.share.share_sheet.ShareSheetPropertyModelBuilder;
  2071. -import org.chromium.chrome.browser.sync.SyncService;
  2072. import org.chromium.chrome.browser.tab.SadTab;
  2073. import org.chromium.chrome.browser.tab.Tab;
  2074. import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  2075. @@ -84,7 +83,7 @@ public class ShareDelegateImpl implements ShareDelegate {
  2076. if (mShareStartTime == 0L) {
  2077. mShareStartTime = System.currentTimeMillis();
  2078. }
  2079. - boolean isSyncEnabled = SyncService.get() != null && SyncService.get().isSyncRequested();
  2080. + boolean isSyncEnabled = false;
  2081. mDelegate.share(params, chromeShareExtras, mBottomSheetController, mLifecycleDispatcher,
  2082. mTabProvider, this::printTab, shareOrigin, isSyncEnabled, mShareStartTime,
  2083. isSharingHubEnabled());
  2084. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareRegistrationCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareRegistrationCoordinator.java
  2085. --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareRegistrationCoordinator.java
  2086. +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareRegistrationCoordinator.java
  2087. @@ -21,7 +21,6 @@ import org.chromium.base.supplier.Supplier;
  2088. import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
  2089. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  2090. import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
  2091. -import org.chromium.chrome.browser.sync.SyncService;
  2092. import org.chromium.chrome.browser.tab.Tab;
  2093. import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  2094. import org.chromium.content_public.browser.NavigationEntry;
  2095. @@ -207,7 +206,7 @@ public class ShareRegistrationCoordinator {
  2096. void doSendTabToSelfShare(@NonNull Context context, @Nullable NavigationEntry entry,
  2097. @NonNull BottomSheetController bottomSheetController) {
  2098. if (entry == null) return;
  2099. - boolean isSyncEnabled = SyncService.get() != null && SyncService.get().isSyncRequested();
  2100. + boolean isSyncEnabled = false;
  2101. bottomSheetController.requestShowContent(
  2102. SendTabToSelfCoordinator.createBottomSheetContent(context, entry.getUrl().getSpec(),
  2103. entry.getTitle(), entry.getTimestamp(), bottomSheetController,
  2104. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
  2105. --- a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
  2106. +++ b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
  2107. @@ -26,7 +26,6 @@ import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  2108. import org.chromium.chrome.browser.sharing.SharingAdapter;
  2109. import org.chromium.chrome.browser.sharing.SharingServiceProxy;
  2110. import org.chromium.chrome.browser.sharing.SharingServiceProxy.DeviceInfo;
  2111. -import org.chromium.chrome.browser.sync.AndroidSyncSettings;
  2112. import org.chromium.components.browser_ui.settings.SettingsLauncher;
  2113. import org.chromium.components.sync.protocol.SharingSpecificFields;
  2114. import org.chromium.ui.widget.ButtonCompat;
  2115. @@ -77,13 +76,11 @@ public class SharedClipboardShareActivity
  2116. mask.setOnClickListener(v -> finish());
  2117. ButtonCompat chromeSettingsButton = findViewById(R.id.chrome_settings);
  2118. - if (!AndroidSyncSettings.get().isChromeSyncEnabled()) {
  2119. chromeSettingsButton.setVisibility(View.VISIBLE);
  2120. chromeSettingsButton.setOnClickListener(view -> {
  2121. SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  2122. settingsLauncher.launchSettingsActivity(ContextUtils.getApplicationContext());
  2123. });
  2124. - }
  2125. onInitialLayoutInflationComplete();
  2126. }
  2127. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
  2128. --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
  2129. +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
  2130. @@ -41,7 +41,6 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
  2131. import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  2132. import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator;
  2133. import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator.HeightObserver;
  2134. -import org.chromium.chrome.browser.datareduction.DataReductionPromoScreen;
  2135. import org.chromium.chrome.browser.feed.shared.FeedFeatures;
  2136. import org.chromium.chrome.browser.feed.webfeed.WebFeedFollowIntroController;
  2137. import org.chromium.chrome.browser.findinpage.FindToolbarObserver;
  2138. @@ -75,8 +74,6 @@ import org.chromium.chrome.browser.profiles.Profile;
  2139. import org.chromium.chrome.browser.read_later.ReadLaterIPHController;
  2140. import org.chromium.chrome.browser.share.ShareDelegate;
  2141. import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
  2142. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  2143. -import org.chromium.chrome.browser.signin.ui.SigninPromoUtil;
  2144. import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator;
  2145. import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsService;
  2146. import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
  2147. @@ -863,23 +860,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  2148. }
  2149. private boolean maybeShowPromo() {
  2150. - // Only one promo can be shown in one run to avoid nagging users too much.
  2151. - if (SigninPromoUtil.launchSigninPromoIfNeeded(mActivity,
  2152. - SyncConsentActivityLauncherImpl.get(),
  2153. - ChromeVersionInfo.getProductMajorVersion())) {
  2154. - return true;
  2155. - }
  2156. - if (DataReductionPromoScreen.launchDataReductionPromo(
  2157. - mActivity, mTabModelSelectorSupplier.get().isIncognitoSelected())) {
  2158. - return true;
  2159. - }
  2160. - if (DefaultBrowserPromoUtils.prepareLaunchPromoIfNeeded(mActivity, mWindowAndroid)) {
  2161. - return true;
  2162. - }
  2163. - if (AppLanguagePromoDialog.maybeShowPrompt(mActivity, mModalDialogManagerSupplier,
  2164. - () -> ApplicationLifetime.terminate(true))) {
  2165. - return true;
  2166. - }
  2167. - return LanguageAskPrompt.maybeShowLanguageAskPrompt(mActivity, mModalDialogManagerSupplier);
  2168. + return false;
  2169. }
  2170. }
  2171. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java
  2172. --- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java
  2173. +++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java
  2174. @@ -36,7 +36,6 @@ import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
  2175. import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  2176. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  2177. import org.chromium.chrome.browser.profiles.Profile;
  2178. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2179. import org.chromium.chrome.browser.tab.Tab;
  2180. import org.chromium.chrome.browser.tab.TabLaunchType;
  2181. import org.chromium.chrome.browser.tabmodel.TabModel;
  2182. @@ -48,7 +47,6 @@ import org.chromium.chrome.features.start_surface.StartSurfaceConfiguration;
  2183. import org.chromium.chrome.features.start_surface.StartSurfaceUserData;
  2184. import org.chromium.components.embedder_support.util.UrlConstants;
  2185. import org.chromium.components.embedder_support.util.UrlUtilities;
  2186. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  2187. import org.chromium.content_public.browser.LoadUrlParams;
  2188. import org.chromium.content_public.common.ResourceRequestBody;
  2189. import org.chromium.ui.base.DeviceFormFactor;
  2190. @@ -527,13 +525,8 @@ public final class ReturnToChromeExperimentsUtil {
  2191. * Caches the status of whether the primary account is synced.
  2192. */
  2193. public static void cachePrimaryAccountSyncStatus() {
  2194. - boolean isPrimaryAccountSync =
  2195. - IdentityServicesProvider.get()
  2196. - .getSigninManager(Profile.getLastUsedRegularProfile())
  2197. - .getIdentityManager()
  2198. - .hasPrimaryAccount(ConsentLevel.SYNC);
  2199. SharedPreferencesManager.getInstance().writeBoolean(
  2200. - ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, isPrimaryAccountSync);
  2201. + ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, false);
  2202. }
  2203. /**
  2204. diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
  2205. --- a/chrome/browser/BUILD.gn
  2206. +++ b/chrome/browser/BUILD.gn
  2207. @@ -2880,8 +2880,6 @@ static_library("browser") {
  2208. "android/signin/fre_mobile_identity_consistency_field_trial.h",
  2209. "android/signin/signin_bridge.cc",
  2210. "android/signin/signin_bridge.h",
  2211. - "android/signin/signin_manager_android.cc",
  2212. - "android/signin/signin_manager_android.h",
  2213. "android/signin/signin_metrics_utils.cc",
  2214. "android/signin/unified_consent_service_bridge.cc",
  2215. "android/signin/web_signin_bridge.cc",
  2216. @@ -3216,8 +3214,6 @@ static_library("browser") {
  2217. "sharing/sms/sms_fetch_request_handler.h",
  2218. "shell_integration_android.cc",
  2219. "signin/identity_services_provider_android.cc",
  2220. - "signin/signin_manager_android_factory.cc",
  2221. - "signin/signin_manager_android_factory.h",
  2222. "ssl/chrome_security_state_client.cc",
  2223. "ssl/chrome_security_state_client.h",
  2224. "ssl/chrome_security_state_model_delegate.cc",
  2225. @@ -3232,8 +3228,6 @@ static_library("browser") {
  2226. "sync/glue/synced_window_delegate_android.h",
  2227. "sync/glue/synced_window_delegates_getter_android.cc",
  2228. "sync/glue/synced_window_delegates_getter_android.h",
  2229. - "sync/sync_error_infobar_delegate_android.cc",
  2230. - "sync/sync_error_infobar_delegate_android.h",
  2231. "sync/sync_service_android_bridge.cc",
  2232. "sync/sync_service_android_bridge.h",
  2233. "sync/trusted_vault_client_android.cc",
  2234. @@ -6037,10 +6031,6 @@ static_library("browser") {
  2235. "signin/logout_tab_helper.h",
  2236. "signin/process_dice_header_delegate_impl.cc",
  2237. "signin/process_dice_header_delegate_impl.h",
  2238. - "signin/signin_manager.cc",
  2239. - "signin/signin_manager.h",
  2240. - "signin/signin_manager_factory.cc",
  2241. - "signin/signin_manager_factory.h",
  2242. ]
  2243. if (is_win) {
  2244. sources += [
  2245. diff --git a/chrome/browser/signin/identity_services_provider_android.cc b/chrome/browser/signin/identity_services_provider_android.cc
  2246. --- a/chrome/browser/signin/identity_services_provider_android.cc
  2247. +++ b/chrome/browser/signin/identity_services_provider_android.cc
  2248. @@ -6,7 +6,6 @@
  2249. #include "chrome/browser/profiles/profile_android.h"
  2250. #include "chrome/browser/signin/identity_manager_factory.h"
  2251. #include "chrome/browser/signin/services/android/jni_headers/IdentityServicesProvider_jni.h"
  2252. -#include "chrome/browser/signin/signin_manager_android_factory.h"
  2253. #include "components/signin/public/identity_manager/identity_manager.h"
  2254. using base::android::JavaParamRef;
  2255. @@ -29,11 +28,3 @@ JNI_IdentityServicesProvider_GetAccountTrackerService(
  2256. IdentityManagerFactory::GetForProfile(profile);
  2257. return identity_manager->LegacyGetAccountTrackerServiceJavaObject();
  2258. }
  2259. -
  2260. -static ScopedJavaLocalRef<jobject>
  2261. -JNI_IdentityServicesProvider_GetSigninManager(
  2262. - JNIEnv* env,
  2263. - const JavaParamRef<jobject>& j_profile_android) {
  2264. - Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile_android);
  2265. - return SigninManagerAndroidFactory::GetJavaObjectForProfile(profile);
  2266. -}
  2267. diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java
  2268. --- a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java
  2269. +++ b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java
  2270. @@ -61,23 +61,9 @@ public class IdentityServicesProvider {
  2271. return result;
  2272. }
  2273. - /**
  2274. - * Getter for {@link SigninManager} instance for given profile.
  2275. - * @param profile The profile to get regarding sign-in manager.
  2276. - * @return a {@link SigninManager} instance.
  2277. - */
  2278. - @MainThread
  2279. - public SigninManager getSigninManager(Profile profile) {
  2280. - ThreadUtils.assertOnUiThread();
  2281. - SigninManager result = IdentityServicesProviderJni.get().getSigninManager(profile);
  2282. - assert result != null;
  2283. - return result;
  2284. - }
  2285. -
  2286. @NativeMethods
  2287. public interface Natives {
  2288. IdentityManager getIdentityManager(Profile profile);
  2289. AccountTrackerService getAccountTrackerService(Profile profile);
  2290. - SigninManager getSigninManager(Profile profile);
  2291. }
  2292. }
  2293. diff --git a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmImportSyncDataDialogCoordinator.java b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmImportSyncDataDialogCoordinator.java
  2294. --- a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmImportSyncDataDialogCoordinator.java
  2295. +++ b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmImportSyncDataDialogCoordinator.java
  2296. @@ -13,7 +13,6 @@ import androidx.annotation.MainThread;
  2297. import org.chromium.base.metrics.RecordUserAction;
  2298. import org.chromium.chrome.browser.profiles.Profile;
  2299. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2300. import org.chromium.components.browser_ui.settings.ManagedPreferencesUtils;
  2301. import org.chromium.components.browser_ui.widget.RadioButtonWithDescription;
  2302. import org.chromium.ui.modaldialog.DialogDismissalCause;
  2303. @@ -80,11 +79,7 @@ public class ConfirmImportSyncDataDialogCoordinator {
  2304. mKeepSeparateOption =
  2305. mConfirmImportSyncDataView.findViewById(R.id.sync_keep_separate_choice);
  2306. - boolean isCurrentAccountManaged =
  2307. - IdentityServicesProvider.get()
  2308. - .getSigninManager(Profile.getLastUsedRegularProfile())
  2309. - .getManagementDomain()
  2310. - != null;
  2311. + boolean isCurrentAccountManaged = false;
  2312. mModel = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
  2313. .with(ModalDialogProperties.CANCEL_ON_TOUCH_OUTSIDE, true)
  2314. .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT,
  2315. diff --git a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataStateMachine.java b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataStateMachine.java
  2316. --- a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataStateMachine.java
  2317. +++ b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataStateMachine.java
  2318. @@ -175,9 +175,6 @@ public class ConfirmSyncDataStateMachine implements ConfirmImportSyncDataDialogC
  2319. }
  2320. private void requestNewAccountManagementStatus() {
  2321. - IdentityServicesProvider.get()
  2322. - .getSigninManager(Profile.getLastUsedRegularProfile())
  2323. - .isAccountManaged(mNewAccountName, this::setIsNewAccountManaged);
  2324. }
  2325. private void setIsNewAccountManaged(Boolean isManaged) {
  2326. @@ -193,17 +190,8 @@ public class ConfirmSyncDataStateMachine implements ConfirmImportSyncDataDialogC
  2327. assert mNewAccountManaged != null;
  2328. assert mState == State.AFTER_NEW_ACCOUNT_DIALOG;
  2329. - if (mNewAccountManaged) {
  2330. - // Show 'logging into managed account' dialog
  2331. - // This will call back into onConfirm on success.
  2332. - mDelegate.showSignInToManagedAccountDialog(this,
  2333. - IdentityServicesProvider.get()
  2334. - .getSigninManager(Profile.getLastUsedRegularProfile())
  2335. - .extractDomainName(mNewAccountName));
  2336. - } else {
  2337. - mDelegate.dismissAllDialogs();
  2338. - progress();
  2339. - }
  2340. + mDelegate.dismissAllDialogs();
  2341. + progress();
  2342. }
  2343. private void showProgressDialog() {
  2344. diff --git a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragment.java b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragment.java
  2345. --- a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragment.java
  2346. +++ b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragment.java
  2347. @@ -19,7 +19,6 @@ import org.chromium.base.metrics.RecordHistogram;
  2348. import org.chromium.chrome.browser.profiles.Profile;
  2349. import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics;
  2350. import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2351. -import org.chromium.chrome.browser.signin.services.SigninManager;
  2352. import org.chromium.chrome.browser.signin.services.SigninMetricsUtils;
  2353. import org.chromium.components.signin.GAIAServiceType;
  2354. @@ -67,12 +66,6 @@ public class SignOutDialogFragment
  2355. mGaiaServiceType =
  2356. getArguments().getInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType);
  2357. }
  2358. - String domain = IdentityServicesProvider.get()
  2359. - .getSigninManager(Profile.getLastUsedRegularProfile())
  2360. - .getManagementDomain();
  2361. - if (domain != null) {
  2362. - return createDialogForManagedAccount(domain);
  2363. - }
  2364. return createDialog();
  2365. }
  2366. @@ -108,12 +101,6 @@ public class SignOutDialogFragment
  2367. if (which == AlertDialog.BUTTON_POSITIVE) {
  2368. SigninMetricsUtils.logProfileAccountManagementMenu(
  2369. ProfileAccountManagementMetrics.SIGNOUT_SIGNOUT, mGaiaServiceType);
  2370. - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
  2371. - Profile.getLastUsedRegularProfile());
  2372. - if (signinManager.getManagementDomain() == null) {
  2373. - RecordHistogram.recordBooleanHistogram(
  2374. - "Signin.UserRequestedWipeDataOnSignout", mWipeUserData.isChecked());
  2375. - }
  2376. SignOutDialogListener targetFragment = (SignOutDialogListener) getTargetFragment();
  2377. targetFragment.onSignOutClicked(mWipeUserData != null && mWipeUserData.isChecked());
  2378. }
  2379. diff --git a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoController.java b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoController.java
  2380. --- a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoController.java
  2381. +++ b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoController.java
  2382. @@ -82,20 +82,7 @@ public class SigninPromoController {
  2383. * @param accessPoint The access point for which the impression limit is being checked.
  2384. */
  2385. public static boolean canShowSyncPromo(@AccessPoint int accessPoint) {
  2386. - switch (accessPoint) {
  2387. - case SigninAccessPoint.BOOKMARK_MANAGER:
  2388. - return canShowBookmarkPromo();
  2389. - case SigninAccessPoint.NTP_CONTENT_SUGGESTIONS:
  2390. - return canShowNTPPromo();
  2391. - case SigninAccessPoint.RECENT_TABS:
  2392. - // There is no impression limit or dismiss button in Recent Tabs promo.
  2393. - return true;
  2394. - case SigninAccessPoint.SETTINGS:
  2395. - return canShowSettingsPromo();
  2396. - default:
  2397. - assert false : "Unexpected value for access point: " + accessPoint;
  2398. - return false;
  2399. - }
  2400. + return false;
  2401. }
  2402. /**
  2403. diff --git a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerDelegateImpl.java b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerDelegateImpl.java
  2404. --- a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerDelegateImpl.java
  2405. +++ b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerDelegateImpl.java
  2406. @@ -41,7 +41,6 @@ public class AccountPickerDelegateImpl implements WebSigninBridge.Listener, Acco
  2407. private final Tab mCurrentTab;
  2408. private final WebSigninBridge.Factory mWebSigninBridgeFactory;
  2409. private final String mContinueUrl;
  2410. - private final SigninManager mSigninManager;
  2411. private final IdentityManager mIdentityManager;
  2412. private @Nullable WebSigninBridge mWebSigninBridge;
  2413. private Callback<GoogleServiceAuthError> mOnSignInErrorCallback;
  2414. @@ -61,8 +60,6 @@ public class AccountPickerDelegateImpl implements WebSigninBridge.Listener, Acco
  2415. mCurrentTab = currentTab;
  2416. mWebSigninBridgeFactory = webSigninBridgeFactory;
  2417. mContinueUrl = continueUrl;
  2418. - mSigninManager = IdentityServicesProvider.get().getSigninManager(
  2419. - Profile.getLastUsedRegularProfile());
  2420. mIdentityManager = IdentityServicesProvider.get().getIdentityManager(
  2421. Profile.getLastUsedRegularProfile());
  2422. }
  2423. @@ -87,26 +84,11 @@ public class AccountPickerDelegateImpl implements WebSigninBridge.Listener, Acco
  2424. // if user retries the sign-in from the error screen, we need to sign out the user
  2425. // first before signing in again.
  2426. destroyWebSigninBridge();
  2427. - // TODO(https://crbug.com/1133752): Revise sign-out reason
  2428. - mSigninManager.signOut(SignoutReason.ABORT_SIGNIN);
  2429. }
  2430. mOnSignInErrorCallback = onSignInErrorCallback;
  2431. AccountInfoServiceProvider.get().getAccountInfoByEmail(accountEmail).then(accountInfo -> {
  2432. mWebSigninBridge = mWebSigninBridgeFactory.create(
  2433. Profile.getLastUsedRegularProfile(), accountInfo, this);
  2434. - mSigninManager.signin(AccountUtils.createAccountFromName(accountEmail),
  2435. - new SigninManager.SignInCallback() {
  2436. - @Override
  2437. - public void onSignInComplete() {
  2438. - // After the sign-in is finished in Chrome, we still need to wait for
  2439. - // WebSigninBridge to be called to redirect to the continue url.
  2440. - }
  2441. -
  2442. - @Override
  2443. - public void onSignInAborted() {
  2444. - AccountPickerDelegateImpl.this.destroyWebSigninBridge();
  2445. - }
  2446. - });
  2447. });
  2448. }
  2449. diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
  2450. --- a/chrome/browser/sync/sync_service_factory.cc
  2451. +++ b/chrome/browser/sync/sync_service_factory.cc
  2452. @@ -77,7 +77,7 @@
  2453. #include "chrome/browser/sync/wifi_configuration_sync_service_factory.h"
  2454. #endif // BUILDFLAG(IS_CHROMEOS_ASH)
  2455. -namespace {
  2456. +/*namespace {
  2457. std::unique_ptr<KeyedService> BuildSyncService(
  2458. content::BrowserContext* context) {
  2459. @@ -174,7 +174,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
  2460. return sync_service;
  2461. }
  2462. -} // anonymous namespace
  2463. +}*/ // anonymous namespace
  2464. // static
  2465. SyncServiceFactory* SyncServiceFactory::GetInstance() {
  2466. @@ -258,7 +258,7 @@ SyncServiceFactory::~SyncServiceFactory() = default;
  2467. KeyedService* SyncServiceFactory::BuildServiceInstanceFor(
  2468. content::BrowserContext* context) const {
  2469. - return BuildSyncService(context).release();
  2470. + return nullptr;
  2471. }
  2472. bool SyncServiceFactory::ServiceIsNULLWhileTesting() const {
  2473. @@ -300,9 +300,3 @@ SyncServiceFactory::GetAllSyncServices() {
  2474. }
  2475. return sync_services;
  2476. }
  2477. -
  2478. -// static
  2479. -BrowserContextKeyedServiceFactory::TestingFactory
  2480. -SyncServiceFactory::GetDefaultFactory() {
  2481. - return base::BindRepeating(&BuildSyncService);
  2482. -}
  2483. diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
  2484. --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
  2485. +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
  2486. @@ -278,9 +278,6 @@ CHAR_LIMIT guidelines:
  2487. <message name="IDS_SIGN_IN_TO_CHROME" desc="Title for the button to sign in to Chrome using one's Google account. [CHAR_LIMIT=27]">
  2488. Sign in to Chrome
  2489. </message>
  2490. - <message name="IDS_PREFS_MANAGE_SYNC_SETTINGS_CONTENT_DESCRIPTION" is_accessibility_with_no_ui="true" desc="The accessibility text to read when the 'Manage Sync Settings' page is opened from the sign-in page. This text is attached to the 'Navigate Up' button shown at the top of the screen. The first two sentences describe the screen that is currently shown to the user, while 'Navigate up' is a description for the button this text is attached to. 'Navigate up' should match TC ID 6794660482873516081.">
  2491. - You are currently customizing your Sync settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up
  2492. - </message>
  2493. <message name="IDS_SIGNIN_PREF_SUMMARY" desc="Summary for the entry in Settings to sign in to Chrome, explaining benefits of signing in.">
  2494. Sync and personalize across devices
  2495. </message>
  2496. @@ -333,15 +330,6 @@ CHAR_LIMIT guidelines:
  2497. <message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
  2498. Sends URLs of pages you visit to Google
  2499. </message>
  2500. - <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK_LEGACY" desc="The text for Privacy preferences that is shown after all preference rows.">
  2501. - For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK">&lt;link&gt;</ph>Sync and Google services<ph name="END_LINK">&lt;/link&gt;</ph>
  2502. - </message>
  2503. - <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK_SYNC_ON" desc="The text for Privacy preferences that is shown after all preference rows. This version of the text is shown if Sync has been turned on.">
  2504. - For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Sync<ph name="END_LINK1">&lt;/link1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>Google services<ph name="END_LINK2">&lt;/link2&gt;</ph>
  2505. - </message>
  2506. - <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK_SYNC_OFF" desc="The text for Privacy preferences that is shown after all preference rows. This version of the text is shown if Sync hasn't been turned on.">
  2507. - For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK">&lt;link&gt;</ph>Google services<ph name="END_LINK">&lt;/link&gt;</ph>
  2508. - </message>
  2509. <!-- Metrics settings -->
  2510. <message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]">
  2511. diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
  2512. --- a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
  2513. +++ b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
  2514. @@ -131,13 +131,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
  2515. }
  2516. protected boolean hasFeatures(Account account, String[] features) {
  2517. - if (hasGetAccountsPermission()) {
  2518. - try {
  2519. - return mAccountManager.hasFeatures(account, features, null, null).getResult();
  2520. - } catch (AuthenticatorException | IOException | OperationCanceledException e) {
  2521. - Log.e(TAG, "Error while checking features: ", e);
  2522. - }
  2523. - }
  2524. return false;
  2525. }
  2526. @@ -178,32 +171,10 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
  2527. public void updateCredentials(
  2528. Account account, Activity activity, final Callback<Boolean> callback) {
  2529. ThreadUtils.assertOnUiThread();
  2530. - if (!hasManageAccountsPermission()) {
  2531. - if (callback != null) {
  2532. - ThreadUtils.postOnUiThread(callback.bind(false));
  2533. - }
  2534. - return;
  2535. + if (callback != null) {
  2536. + ThreadUtils.postOnUiThread(callback.bind(false));
  2537. }
  2538. -
  2539. - AccountManagerCallback<Bundle> realCallback = future -> {
  2540. - Bundle bundle = null;
  2541. - try {
  2542. - bundle = future.getResult();
  2543. - } catch (AuthenticatorException | IOException e) {
  2544. - Log.e(TAG, "Error while update credentials: ", e);
  2545. - } catch (OperationCanceledException e) {
  2546. - Log.w(TAG, "Updating credentials was cancelled.");
  2547. - }
  2548. - boolean success =
  2549. - bundle != null && bundle.getString(AccountManager.KEY_ACCOUNT_TYPE) != null;
  2550. - if (callback != null) {
  2551. - callback.onResult(success);
  2552. - }
  2553. - };
  2554. - // Android 4.4 throws NullPointerException if null is passed
  2555. - Bundle emptyOptions = new Bundle();
  2556. - mAccountManager.updateCredentials(
  2557. - account, "android", emptyOptions, activity, realCallback, null);
  2558. + return;
  2559. }
  2560. @Nullable
  2561. diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
  2562. --- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
  2563. +++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
  2564. @@ -98,54 +98,8 @@ public class HttpNegotiateAuthenticator {
  2565. @Override
  2566. public void run(AccountManagerFuture<Account[]> future) {
  2567. - Account[] accounts;
  2568. - try {
  2569. - accounts = future.getResult();
  2570. - } catch (OperationCanceledException | AuthenticatorException | IOException e) {
  2571. - Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to retrieve accounts.", e);
  2572. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  2573. - HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
  2574. - return;
  2575. - }
  2576. -
  2577. - if (accounts.length == 0) {
  2578. - Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: No account provided for the kerberos "
  2579. - + "authentication. Please verify the configuration policies and "
  2580. - + "that the CONTACTS runtime permission is granted. ");
  2581. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  2582. - HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
  2583. - null);
  2584. - return;
  2585. - }
  2586. -
  2587. - if (accounts.length > 1) {
  2588. - Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: Found %d accounts eligible for the "
  2589. - + "kerberos authentication. Please fix the configuration by "
  2590. - + "providing a single account.",
  2591. - accounts.length);
  2592. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  2593. - HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
  2594. - null);
  2595. - return;
  2596. - }
  2597. -
  2598. - if (lacksPermission(ContextUtils.getApplicationContext(),
  2599. - "android.permission.USE_CREDENTIALS", true)) {
  2600. - // Protecting the AccountManager#getAuthToken call.
  2601. - // API < 23 Requires the USE_CREDENTIALS permission or throws an exception.
  2602. - // API >= 23 USE_CREDENTIALS permission is removed
  2603. - Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: USE_CREDENTIALS permission not "
  2604. - + "granted. Aborting authentication.");
  2605. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  2606. - HttpNegotiateAuthenticator.this,
  2607. - NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
  2608. - return;
  2609. - }
  2610. - mRequestData.account = accounts[0];
  2611. - mRequestData.accountManager.getAuthToken(mRequestData.account,
  2612. - mRequestData.authTokenType, mRequestData.options, true /* notifyAuthFailure */,
  2613. - new GetTokenCallback(mRequestData),
  2614. - new Handler(ThreadUtils.getUiThreadLooper()));
  2615. + // account-based authentication removed for privacy-violations concerns
  2616. + return;
  2617. }
  2618. }
  2619. @@ -158,42 +112,8 @@ public class HttpNegotiateAuthenticator {
  2620. @Override
  2621. public void run(AccountManagerFuture<Bundle> future) {
  2622. - Bundle result;
  2623. - try {
  2624. - result = future.getResult();
  2625. - } catch (OperationCanceledException | AuthenticatorException | IOException e) {
  2626. - Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to obtain a token.", e);
  2627. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  2628. - HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
  2629. - return;
  2630. - }
  2631. -
  2632. - if (result.containsKey(AccountManager.KEY_INTENT)) {
  2633. - final Context appContext = ContextUtils.getApplicationContext();
  2634. -
  2635. - // We wait for a broadcast that should be sent once the user is done interacting
  2636. - // with the notification
  2637. - // TODO(dgn) We currently hang around if the notification is swiped away, until
  2638. - // a LOGIN_ACCOUNTS_CHANGED_ACTION filter is received. It might be for something
  2639. - // unrelated then we would wait again here. Maybe we should limit the number of
  2640. - // retries in some way?
  2641. - BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
  2642. -
  2643. - @Override
  2644. - public void onReceive(Context context, Intent intent) {
  2645. - appContext.unregisterReceiver(this);
  2646. - mRequestData.accountManager.getAuthToken(mRequestData.account,
  2647. - mRequestData.authTokenType, mRequestData.options,
  2648. - true /* notifyAuthFailure */, new GetTokenCallback(mRequestData),
  2649. - null);
  2650. - }
  2651. -
  2652. - };
  2653. - appContext.registerReceiver(broadcastReceiver,
  2654. - new IntentFilter(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION));
  2655. - } else {
  2656. - processResult(result, mRequestData);
  2657. - }
  2658. + // account-based authentication removed for privacy-violations concerns
  2659. + return;
  2660. }
  2661. }
  2662. diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
  2663. --- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
  2664. +++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
  2665. @@ -93,7 +93,6 @@ public class OAuthTokenFetcher {
  2666. /** Begins fetching a token. Should be called on the main thread. */
  2667. public void fetch() {
  2668. - fetchImpl(null);
  2669. }
  2670. /**
  2671. @@ -102,7 +101,6 @@ public class OAuthTokenFetcher {
  2672. * @param expiredToken A previously-fetched token which has expired.
  2673. */
  2674. public void clearAndFetch(String expiredToken) {
  2675. - fetchImpl(expiredToken);
  2676. }
  2677. private void fetchImpl(final String expiredToken) {
  2678. --
  2679. 2.17.1