Remove-signin-and-sync-integrations.patch 310 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584358535863587358835893590359135923593359435953596359735983599360036013602360336043605360636073608360936103611361236133614361536163617361836193620362136223623362436253626362736283629363036313632363336343635363636373638363936403641364236433644364536463647364836493650365136523653365436553656365736583659366036613662366336643665366636673668366936703671367236733674367536763677367836793680368136823683368436853686368736883689369036913692369336943695369636973698369937003701370237033704370537063707370837093710371137123713371437153716371737183719372037213722372337243725372637273728372937303731373237333734373537363737373837393740374137423743374437453746374737483749375037513752375337543755375637573758375937603761376237633764376537663767376837693770377137723773377437753776377737783779378037813782378337843785378637873788378937903791379237933794379537963797379837993800380138023803380438053806380738083809381038113812381338143815381638173818381938203821382238233824382538263827382838293830383138323833383438353836383738383839384038413842384338443845384638473848384938503851385238533854385538563857385838593860386138623863386438653866386738683869387038713872387338743875387638773878387938803881388238833884388538863887388838893890389138923893389438953896389738983899390039013902390339043905390639073908390939103911391239133914391539163917391839193920392139223923392439253926392739283929393039313932393339343935393639373938393939403941394239433944394539463947394839493950395139523953395439553956395739583959396039613962396339643965396639673968396939703971397239733974397539763977397839793980398139823983398439853986398739883989399039913992399339943995399639973998399940004001400240034004400540064007400840094010401140124013401440154016401740184019402040214022402340244025402640274028402940304031403240334034403540364037403840394040404140424043404440454046404740484049405040514052405340544055405640574058405940604061406240634064406540664067406840694070407140724073407440754076407740784079408040814082408340844085408640874088408940904091409240934094409540964097409840994100410141024103410441054106410741084109411041114112411341144115411641174118411941204121412241234124412541264127412841294130413141324133413441354136413741384139414041414142414341444145414641474148414941504151415241534154415541564157415841594160416141624163416441654166416741684169417041714172417341744175417641774178417941804181418241834184418541864187418841894190419141924193419441954196419741984199420042014202420342044205420642074208420942104211421242134214421542164217421842194220422142224223422442254226422742284229423042314232423342344235423642374238423942404241424242434244424542464247424842494250425142524253425442554256425742584259426042614262426342644265426642674268426942704271427242734274427542764277427842794280428142824283428442854286428742884289429042914292429342944295429642974298429943004301430243034304430543064307430843094310431143124313431443154316431743184319432043214322432343244325432643274328432943304331433243334334433543364337433843394340434143424343434443454346434743484349435043514352435343544355435643574358435943604361436243634364436543664367436843694370437143724373437443754376437743784379438043814382438343844385438643874388438943904391439243934394439543964397439843994400440144024403440444054406440744084409441044114412441344144415441644174418441944204421442244234424442544264427442844294430443144324433443444354436443744384439444044414442444344444445444644474448444944504451445244534454445544564457445844594460446144624463446444654466446744684469447044714472447344744475447644774478447944804481448244834484448544864487448844894490449144924493449444954496449744984499450045014502450345044505450645074508450945104511451245134514451545164517451845194520452145224523452445254526452745284529453045314532453345344535453645374538453945404541454245434544454545464547454845494550455145524553455445554556455745584559456045614562456345644565456645674568456945704571457245734574457545764577457845794580458145824583458445854586458745884589459045914592459345944595459645974598459946004601460246034604460546064607460846094610461146124613461446154616461746184619462046214622462346244625462646274628462946304631463246334634463546364637463846394640464146424643464446454646464746484649465046514652465346544655465646574658465946604661466246634664466546664667466846694670467146724673467446754676467746784679468046814682468346844685468646874688468946904691469246934694469546964697469846994700470147024703470447054706470747084709471047114712471347144715471647174718471947204721472247234724472547264727472847294730473147324733473447354736473747384739474047414742474347444745474647474748474947504751475247534754475547564757475847594760476147624763476447654766476747684769477047714772477347744775477647774778477947804781478247834784478547864787478847894790479147924793479447954796479747984799480048014802480348044805480648074808480948104811481248134814481548164817481848194820482148224823482448254826482748284829483048314832483348344835483648374838483948404841484248434844484548464847484848494850485148524853485448554856485748584859486048614862486348644865486648674868486948704871487248734874487548764877487848794880488148824883488448854886488748884889489048914892489348944895489648974898489949004901490249034904490549064907490849094910491149124913491449154916491749184919492049214922492349244925492649274928492949304931493249334934493549364937493849394940494149424943494449454946494749484949495049514952495349544955495649574958495949604961496249634964496549664967496849694970497149724973497449754976497749784979498049814982498349844985498649874988498949904991499249934994499549964997499849995000500150025003500450055006500750085009501050115012501350145015501650175018501950205021502250235024502550265027502850295030503150325033503450355036503750385039504050415042504350445045504650475048504950505051505250535054505550565057505850595060506150625063506450655066506750685069507050715072507350745075507650775078507950805081508250835084508550865087508850895090509150925093509450955096509750985099510051015102510351045105510651075108510951105111511251135114511551165117511851195120512151225123512451255126512751285129513051315132513351345135513651375138513951405141514251435144514551465147514851495150515151525153515451555156515751585159516051615162516351645165516651675168516951705171517251735174517551765177517851795180518151825183518451855186518751885189519051915192519351945195519651975198519952005201520252035204520552065207520852095210521152125213521452155216521752185219522052215222522352245225522652275228522952305231523252335234523552365237523852395240524152425243524452455246524752485249525052515252525352545255525652575258525952605261526252635264526552665267526852695270527152725273527452755276527752785279528052815282528352845285528652875288528952905291529252935294529552965297529852995300530153025303530453055306530753085309531053115312531353145315531653175318531953205321532253235324532553265327532853295330533153325333533453355336533753385339534053415342534353445345534653475348534953505351535253535354535553565357535853595360536153625363536453655366536753685369537053715372537353745375537653775378537953805381538253835384538553865387538853895390539153925393539453955396539753985399540054015402540354045405540654075408540954105411541254135414541554165417541854195420542154225423542454255426542754285429543054315432543354345435543654375438543954405441544254435444544554465447544854495450545154525453545454555456545754585459546054615462546354645465546654675468546954705471547254735474547554765477547854795480548154825483548454855486548754885489549054915492549354945495549654975498549955005501550255035504550555065507550855095510551155125513551455155516551755185519552055215522552355245525552655275528552955305531553255335534553555365537553855395540554155425543554455455546554755485549555055515552555355545555555655575558555955605561556255635564556555665567556855695570557155725573557455755576557755785579558055815582558355845585558655875588558955905591559255935594559555965597559855995600560156025603560456055606560756085609561056115612561356145615561656175618561956205621562256235624562556265627562856295630563156325633563456355636563756385639564056415642564356445645564656475648564956505651565256535654565556565657565856595660566156625663566456655666566756685669567056715672567356745675567656775678567956805681568256835684568556865687568856895690569156925693569456955696569756985699570057015702570357045705570657075708570957105711571257135714571557165717571857195720572157225723572457255726572757285729573057315732573357345735573657375738573957405741574257435744574557465747574857495750575157525753575457555756575757585759576057615762576357645765576657675768576957705771577257735774577557765777577857795780578157825783578457855786578757885789579057915792579357945795579657975798579958005801580258035804580558065807580858095810581158125813581458155816581758185819582058215822582358245825582658275828582958305831583258335834583558365837583858395840584158425843584458455846584758485849585058515852585358545855585658575858585958605861586258635864586558665867586858695870587158725873587458755876587758785879588058815882588358845885588658875888588958905891589258935894589558965897589858995900590159025903590459055906590759085909591059115912591359145915591659175918591959205921592259235924592559265927592859295930593159325933593459355936593759385939594059415942594359445945594659475948594959505951595259535954595559565957595859595960596159625963596459655966596759685969597059715972597359745975597659775978597959805981598259835984598559865987598859895990599159925993599459955996599759985999600060016002600360046005600660076008600960106011601260136014601560166017601860196020602160226023602460256026602760286029603060316032603360346035603660376038603960406041604260436044604560466047604860496050605160526053605460556056605760586059606060616062606360646065606660676068606960706071607260736074607560766077607860796080608160826083608460856086608760886089609060916092
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Tue, 12 Jun 2018 14:23:07 +0200
  3. Subject: Remove signin and sync integrations
  4. Prevents authorization prompt for Play services on reboot
  5. Remove recent tabs signin
  6. Disable unused permissions from manifest
  7. Disable sync adaptive and invalidation services from manifest
  8. More permissions removal from manifest
  9. Disable promos displayed in bookmarks manager
  10. Remove personalized signin promo view from
  11. bookmarks, never reach signin thresholds.
  12. Fix building with debug symbols:
  13. ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
  14. >>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
  15. >>> impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
  16. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  17. ---
  18. chrome/android/BUILD.gn | 26 ---
  19. chrome/android/chrome_java_sources.gni | 34 ---
  20. .../features/autofill_assistant/BUILD.gn | 1 -
  21. .../AssistantAccessTokenUtilChrome.java | 14 --
  22. .../AssistantDependencyUtilsChrome.java | 4 +-
  23. .../AssistantProfileImageUtilChrome.java | 25 +--
  24. .../AssistantStaticDependenciesChrome.java | 12 +-
  25. .../public/java_sources.gni | 1 -
  26. chrome/android/features/tab_ui/BUILD.gn | 1 -
  27. .../PriceTrackingUtilities.java | 15 +-
  28. .../TabSuggestionsServerFetcher.java | 12 +-
  29. .../browser/feed/FeedSurfaceCoordinator.java | 26 +--
  30. .../browser/feed/FeedSurfaceMediator.java | 95 +-------
  31. chrome/android/java/AndroidManifest.xml | 19 --
  32. .../res/xml/google_services_preferences.xml | 5 -
  33. .../android/java/res/xml/main_preferences.xml | 22 +-
  34. .../java/res/xml/manage_sync_preferences.xml | 12 -
  35. .../java/res/xml/privacy_preferences.xml | 4 -
  36. .../org/chromium/chrome/browser/AppHooks.java | 26 ---
  37. .../chrome/browser/ChromeBackupAgentImpl.java | 9 +-
  38. .../chrome/browser/ChromeBackupWatcher.java | 12 -
  39. .../chrome/browser/ChromeTabbedActivity.java | 19 --
  40. .../chrome/browser/app/ChromeActivity.java | 76 -------
  41. .../AutofillAssistantPreferenceFragment.java | 17 +-
  42. .../bookmarks/BookmarkItemsAdapter.java | 49 +----
  43. .../bookmarks/BookmarkPromoHeader.java | 207 +-----------------
  44. .../ClearBrowsingDataFragmentBasic.java | 33 +--
  45. .../contacts_picker/ChromePickerAdapter.java | 62 +-----
  46. .../browser/customtabs/CustomTabActivity.java | 3 -
  47. .../browser/firstrun/FirstRunActivity.java | 2 +-
  48. .../firstrun/FirstRunActivityBase.java | 1 -
  49. .../firstrun/FirstRunFlowSequencer.java | 10 +-
  50. .../firstrun/FirstRunPageDelegate.java | 5 -
  51. .../firstrun/LightweightFirstRunActivity.java | 6 +-
  52. ...FirstRunFragmentWithEnterpriseSupport.java | 6 -
  53. .../history/HistoryContentManager.java | 26 +--
  54. .../identity_disc/IdentityDiscController.java | 131 +----------
  55. .../browser/infobar/SavePasswordInfoBar.java | 15 +-
  56. .../infobar/UpdatePasswordInfoBar.java | 17 +-
  57. .../init/ChromeBrowserInitializer.java | 2 -
  58. .../init/ProcessInitializationHandler.java | 7 -
  59. .../chrome/browser/ntp/RecentTabsManager.java | 114 +---------
  60. .../browser/ntp/RecentTabsRowAdapter.java | 54 -----
  61. .../browser/ntp/search/SearchBoxMediator.java | 1 -
  62. .../browser/omaha/RequestGenerator.java | 3 -
  63. .../AccountChooserDialog.java | 2 +-
  64. .../PasswordManagerLauncher.java | 15 +-
  65. .../settings/PasswordSettings.java | 71 +-----
  66. .../browser/payments/ui/PaymentRequestUI.java | 10 -
  67. .../privacy/settings/PrivacySettings.java | 31 ---
  68. .../chrome/browser/settings/MainSettings.java | 125 +----------
  69. .../browser/settings/SettingsActivity.java | 13 +-
  70. .../SharedClipboardShareActivity.java | 3 -
  71. .../tabbed_mode/TabbedRootUiCoordinator.java | 19 --
  72. .../browser/tasks/ReturnToChromeUtil.java | 9 +-
  73. chrome/browser/BUILD.gn | 150 -------------
  74. .../chrome_autocomplete_provider_client.cc | 21 +-
  75. .../chrome_autocomplete_provider_client.h | 1 -
  76. .../document_suggestions_service_factory.cc | 6 +-
  77. .../autofill/personal_data_manager_factory.cc | 4 +-
  78. .../common_dependencies_chrome.cc | 13 --
  79. .../common_dependencies_chrome.h | 3 -
  80. .../chrome_browsing_data_lifetime_manager.cc | 6 +-
  81. .../counters/browsing_data_counter_utils.cc | 6 -
  82. chrome/browser/chrome_browser_field_trials.cc | 6 +-
  83. .../endpoint_fetcher/endpoint_fetcher.cc | 2 +-
  84. .../profile_report_generator_delegate_base.cc | 11 -
  85. ...tory_ui_favicon_request_handler_factory.cc | 1 -
  86. chrome/browser/feed/android/BUILD.gn | 1 -
  87. .../chrome/browser/feed/FeedFeatures.java | 2 -
  88. chrome/browser/feed/feed_service_factory.cc | 6 +-
  89. .../browser/firstrun/MobileFreProgress.java | 4 +-
  90. .../gcm/gcm_profile_service_factory.cc | 4 +-
  91. .../profile_invalidation_provider_factory.cc | 48 +---
  92. .../router/discovery/access_code/BUILD.gn | 1 -
  93. .../metrics/chrome_metrics_service_client.cc | 6 -
  94. .../browser/password_manager/android/BUILD.gn | 6 -
  95. .../PasswordManagerHelper.java | 94 +-------
  96. ...swordSyncControllerDelegateBridgeImpl.java | 7 -
  97. .../chrome_password_manager_client.cc | 120 +---------
  98. .../chrome_password_manager_client.h | 25 ---
  99. ...ssword_manager_settings_service_factory.cc | 6 -
  100. chrome/browser/privacy/BUILD.gn | 2 -
  101. .../res/layout/privacy_review_msbb_step.xml | 8 -
  102. chrome/browser/profiles/profile_impl.cc | 15 +-
  103. .../verdict_cache_manager_factory.cc | 5 +-
  104. .../DevicePickerBottomSheetContent.java | 46 ----
  105. .../SendTabToSelfCoordinator.java | 104 +--------
  106. .../android/infobars/save_password_infobar.cc | 5 +-
  107. .../infobars/update_password_infobar.cc | 6 +-
  108. chrome/browser/ui/android/omnibox/BUILD.gn | 2 -
  109. .../browser/omnibox/LocationBarMediator.java | 1 -
  110. .../strings/android_chrome_strings.grd | 18 --
  111. .../AssistantStaticDependencies.java | 3 -
  112. .../browser/android/dependencies_android.cc | 7 -
  113. .../browser/common_dependencies.h | 3 -
  114. .../browser/headless/client_headless.cc | 17 --
  115. .../browser/headless/client_headless.h | 1 -
  116. .../browser/autocomplete_provider_client.h | 7 -
  117. .../password_manager/core/browser/BUILD.gn | 9 -
  118. .../core/browser/leak_detection_delegate.cc | 2 +-
  119. .../core/browser/password_form_manager.cc | 34 +--
  120. .../core/browser/password_manager.cc | 82 -------
  121. .../core/browser/password_manager_client.h | 20 --
  122. .../browser/password_manager_client_helper.cc | 43 +---
  123. .../core/browser/sync_credentials_filter.cc | 48 +---
  124. components/signin/features.gni | 4 +-
  125. .../signin/SystemAccountManagerDelegate.java | 25 +--
  126. .../net/HttpNegotiateAuthenticator.java | 88 +-------
  127. .../chromoting/base/OAuthTokenFetcher.java | 2 -
  128. 110 files changed, 90 insertions(+), 2616 deletions(-)
  129. diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
  130. --- a/chrome/android/BUILD.gn
  131. +++ b/chrome/android/BUILD.gn
  132. @@ -226,14 +226,12 @@ android_resources("chrome_app_java_resources") {
  133. "//chrome/browser/lens:java_resources",
  134. "//chrome/browser/password_check/android:java_resources",
  135. "//chrome/browser/password_manager/android:java_resources",
  136. - "//chrome/browser/signin/services/android:java_resources",
  137. "//chrome/browser/tab:java_resources",
  138. "//chrome/browser/ui/android/appmenu:java_resources",
  139. "//chrome/browser/ui/android/favicon:java_resources",
  140. "//chrome/browser/ui/android/management:java_resources",
  141. "//chrome/browser/ui/android/omnibox:java_resources",
  142. "//chrome/browser/ui/android/quickactionsearchwidget:java_resources",
  143. - "//chrome/browser/ui/android/signin:java_resources",
  144. "//chrome/browser/ui/android/strings:ui_strings_grd",
  145. "//chrome/browser/ui/android/theme:java_resources",
  146. "//chrome/browser/ui/android/toolbar:java_resources",
  147. @@ -422,8 +420,6 @@ android_library("chrome_java") {
  148. "//chrome/browser/settings:java",
  149. "//chrome/browser/share:java",
  150. "//chrome/browser/share/android:java_resources",
  151. - "//chrome/browser/signin/services/android:java",
  152. - "//chrome/browser/sync/android:java",
  153. "//chrome/browser/tab:java",
  154. "//chrome/browser/tab_group:java",
  155. "//chrome/browser/tabmodel:factory_java",
  156. @@ -446,7 +442,6 @@ android_library("chrome_java") {
  157. "//chrome/browser/ui/android/page_info:java",
  158. "//chrome/browser/ui/android/quickactionsearchwidget:java",
  159. "//chrome/browser/ui/android/searchactivityutils:java",
  160. - "//chrome/browser/ui/android/signin:java",
  161. "//chrome/browser/ui/android/theme:java",
  162. "//chrome/browser/ui/android/toolbar:java",
  163. "//chrome/browser/ui/messages/android:java",
  164. @@ -561,7 +556,6 @@ android_library("chrome_java") {
  165. "//components/security_state/core:security_state_enums_java",
  166. "//components/segmentation_platform/public:public_java",
  167. "//components/signin/core/browser:signin_enums_java",
  168. - "//components/signin/public/android:java",
  169. "//components/site_engagement/content/android:java",
  170. "//components/spellcheck/browser/android:java",
  171. "//components/strictmode/android:java",
  172. @@ -814,7 +808,6 @@ java_group("chrome_all_java") {
  173. group("jni_headers") {
  174. public_deps = [
  175. ":chrome_jni_headers",
  176. - "//chrome/android/features/autofill_assistant:jni_headers_public",
  177. "//chrome/android/features/keyboard_accessory:jni_headers",
  178. "//chrome/android/features/start_surface:jni_headers",
  179. "//chrome/browser/android/browserservices/metrics:jni_headers",
  180. @@ -1029,9 +1022,6 @@ junit_binary("chrome_junit_tests") {
  181. "//chrome/browser/safety_check/android:junit",
  182. "//chrome/browser/search_engines/android:java",
  183. "//chrome/browser/share:java",
  184. - "//chrome/browser/signin/services/android:java",
  185. - "//chrome/browser/signin/services/android:junit",
  186. - "//chrome/browser/sync/android:java",
  187. "//chrome/browser/tab:java",
  188. "//chrome/browser/tab:junit",
  189. "//chrome/browser/tab_group:java",
  190. @@ -1062,8 +1052,6 @@ junit_binary("chrome_junit_tests") {
  191. "//chrome/browser/ui/android/omnibox:junit",
  192. "//chrome/browser/ui/android/quickactionsearchwidget:java",
  193. "//chrome/browser/ui/android/searchactivityutils:java",
  194. - "//chrome/browser/ui/android/signin:java",
  195. - "//chrome/browser/ui/android/signin:junit",
  196. "//chrome/browser/ui/android/theme:java",
  197. "//chrome/browser/ui/android/toolbar:java",
  198. "//chrome/browser/ui/android/toolbar:junit",
  199. @@ -1132,7 +1120,6 @@ junit_binary("chrome_junit_tests") {
  200. "//components/security_state/content/android:java",
  201. "//components/security_state/core:security_state_enums_java",
  202. "//components/signin/core/browser:signin_enums_java",
  203. - "//components/signin/public/android:java",
  204. "//components/signin/public/android:signin_java_test_support",
  205. "//components/sync/android:sync_java",
  206. "//components/ukm/android:java",
  207. @@ -1451,9 +1438,6 @@ android_library("chrome_test_java") {
  208. "//chrome/browser/settings:test_support_java",
  209. "//chrome/browser/share:java",
  210. "//chrome/browser/share/android:java_resources",
  211. - "//chrome/browser/signin/services/android:java",
  212. - "//chrome/browser/signin/services/android:javatests",
  213. - "//chrome/browser/sync/android:java",
  214. "//chrome/browser/sync/test/android:test_support_java",
  215. "//chrome/browser/tab:critical_persisted_tab_data_flatbuffer_java",
  216. "//chrome/browser/tab:critical_persisted_tab_data_proto_java",
  217. @@ -1482,8 +1466,6 @@ android_library("chrome_test_java") {
  218. "//chrome/browser/ui/android/quickactionsearchwidget:javatests",
  219. "//chrome/browser/ui/android/searchactivityutils:java",
  220. "//chrome/browser/ui/android/searchactivityutils:javatests",
  221. - "//chrome/browser/ui/android/signin:java",
  222. - "//chrome/browser/ui/android/signin:javatests",
  223. "//chrome/browser/ui/android/theme:java",
  224. "//chrome/browser/ui/android/toolbar:java",
  225. "//chrome/browser/ui/android/toolbar:javatests",
  226. @@ -1603,7 +1585,6 @@ android_library("chrome_test_java") {
  227. "//components/security_state/content/android:java",
  228. "//components/security_state/core:security_state_enums_java",
  229. "//components/signin/core/browser:signin_enums_java",
  230. - "//components/signin/public/android:java",
  231. "//components/signin/public/android:javatests",
  232. "//components/signin/public/android:signin_java_test_support",
  233. "//components/site_engagement/content/android:java",
  234. @@ -2432,7 +2413,6 @@ android_library("browser_java_test_support") {
  235. "//chrome/browser/download/android:java",
  236. "//chrome/browser/prefetch/android:java",
  237. "//chrome/browser/profiles/android:java",
  238. - "//chrome/browser/sync/android:java",
  239. "//chrome/browser/tab:java",
  240. "//components/offline_items_collection/core:core_java",
  241. "//components/sync/protocol:protocol_java",
  242. @@ -3924,7 +3904,6 @@ generate_jni("chrome_jni_headers") {
  243. "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
  244. "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
  245. "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
  246. - "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java",
  247. "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
  248. "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
  249. "java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java",
  250. @@ -3965,9 +3944,6 @@ generate_jni("chrome_jni_headers") {
  251. "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTask.java",
  252. "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskScheduler.java",
  253. "java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java",
  254. - "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java",
  255. - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java",
  256. - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java",
  257. "java/src/org/chromium/chrome/browser/password_manager/Credential.java",
  258. "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java",
  259. "java/src/org/chromium/chrome/browser/password_manager/PasswordChangeLauncher.java",
  260. @@ -3998,8 +3974,6 @@ generate_jni("chrome_jni_headers") {
  261. "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandler.java",
  262. "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
  263. "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
  264. - "java/src/org/chromium/chrome/browser/signin/SigninBridge.java",
  265. - "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java",
  266. "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
  267. "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
  268. "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
  269. diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
  270. --- a/chrome/android/chrome_java_sources.gni
  271. +++ b/chrome/android/chrome_java_sources.gni
  272. @@ -536,7 +536,6 @@ chrome_java_sources = [
  273. "java/src/org/chromium/chrome/browser/findinpage/FindToolbarObserver.java",
  274. "java/src/org/chromium/chrome/browser/findinpage/FindToolbarPhone.java",
  275. "java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java",
  276. - "java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java",
  277. "java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java",
  278. "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java",
  279. "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java",
  280. @@ -547,14 +546,11 @@ chrome_java_sources = [
  281. "java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java",
  282. "java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java",
  283. "java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java",
  284. - "java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java",
  285. "java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java",
  286. - "java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java",
  287. "java/src/org/chromium/chrome/browser/firstrun/FreIntentCreator.java",
  288. "java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java",
  289. "java/src/org/chromium/chrome/browser/firstrun/PolicyLoadListener.java",
  290. "java/src/org/chromium/chrome/browser/firstrun/SkipTosDialogPolicyListener.java",
  291. - "java/src/org/chromium/chrome/browser/firstrun/SyncConsentFirstRunFragment.java",
  292. "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java",
  293. "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
  294. "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java",
  295. @@ -644,7 +640,6 @@ chrome_java_sources = [
  296. "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java",
  297. "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
  298. "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java",
  299. - "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java",
  300. "java/src/org/chromium/chrome/browser/infobar/TextViewEllipsizerSafe.java",
  301. "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
  302. "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
  303. @@ -758,7 +753,6 @@ chrome_java_sources = [
  304. "java/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionView.java",
  305. "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelperImpl.java",
  306. "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
  307. - "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java",
  308. "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java",
  309. "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java",
  310. "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java",
  311. @@ -822,8 +816,6 @@ chrome_java_sources = [
  312. "java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelperSupplier.java",
  313. "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java",
  314. "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java",
  315. - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java",
  316. - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java",
  317. "java/src/org/chromium/chrome/browser/password_manager/Credential.java",
  318. "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java",
  319. "java/src/org/chromium/chrome/browser/password_manager/GooglePasswordManagerUIProvider.java",
  320. @@ -961,14 +953,6 @@ chrome_java_sources = [
  321. "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java",
  322. "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java",
  323. "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
  324. - "java/src/org/chromium/chrome/browser/signin/SigninBridge.java",
  325. - "java/src/org/chromium/chrome/browser/signin/SigninCheckerProvider.java",
  326. - "java/src/org/chromium/chrome/browser/signin/SigninFirstRunFragment.java",
  327. - "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java",
  328. - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java",
  329. - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImpl.java",
  330. - "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java",
  331. - "java/src/org/chromium/chrome/browser/signin/SyncPromoView.java",
  332. "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java",
  333. "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
  334. "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java",
  335. @@ -1004,26 +988,8 @@ chrome_java_sources = [
  336. "java/src/org/chromium/chrome/browser/suggestions/tile/TileRenderer.java",
  337. "java/src/org/chromium/chrome/browser/suggestions/tile/TopSitesTileView.java",
  338. "java/src/org/chromium/chrome/browser/supervised_user/ChildAccountFeedbackReporter.java",
  339. - "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java",
  340. "java/src/org/chromium/chrome/browser/survey/SurveyController.java",
  341. "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java",
  342. - "java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java",
  343. - "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
  344. - "java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java",
  345. - "java/src/org/chromium/chrome/browser/sync/settings/ClearDataProgressDialog.java",
  346. - "java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java",
  347. - "java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java",
  348. - "java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java",
  349. - "java/src/org/chromium/chrome/browser/sync/settings/SyncErrorCardPreference.java",
  350. - "java/src/org/chromium/chrome/browser/sync/settings/SyncPromoPreference.java",
  351. - "java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java",
  352. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java",
  353. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java",
  354. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java",
  355. - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java",
  356. - "java/src/org/chromium/chrome/browser/sync/ui/SyncErrorMessage.java",
  357. - "java/src/org/chromium/chrome/browser/sync/ui/SyncErrorPromptUtils.java",
  358. - "java/src/org/chromium/chrome/browser/sync/ui/SyncTrustedVaultProxyActivity.java",
  359. "java/src/org/chromium/chrome/browser/tab/AccessibilityVisibilityHandler.java",
  360. "java/src/org/chromium/chrome/browser/tab/AuthenticatorNavigationInterceptorTabHelper.java",
  361. "java/src/org/chromium/chrome/browser/tab/AutofillSessionLifetimeController.java",
  362. diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/android/features/autofill_assistant/BUILD.gn
  363. --- a/chrome/android/features/autofill_assistant/BUILD.gn
  364. +++ b/chrome/android/features/autofill_assistant/BUILD.gn
  365. @@ -125,7 +125,6 @@ android_library("test_java") {
  366. "//chrome/browser/password_manager/android:java",
  367. "//chrome/browser/preferences:java",
  368. "//chrome/browser/profiles/android:java",
  369. - "//chrome/browser/signin/services/android:java",
  370. "//chrome/browser/tab:java",
  371. "//chrome/browser/tabmodel:java",
  372. "//chrome/browser/ui/android/omnibox:java",
  373. diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java
  374. --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java
  375. +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java
  376. @@ -6,10 +6,7 @@ package org.chromium.chrome.browser.autofill_assistant;
  377. import android.accounts.Account;
  378. -import org.chromium.chrome.browser.profiles.Profile;
  379. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  380. import org.chromium.components.autofill_assistant.AssistantAccessTokenUtil;
  381. -import org.chromium.components.signin.identitymanager.IdentityManager;
  382. /**
  383. * Implementation of {@link AssistantAccessTokenUtil} for Chrome.
  384. @@ -19,18 +16,7 @@ public class AssistantAccessTokenUtilChrome implements AssistantAccessTokenUtil
  385. private static final String AUTH_TOKEN_TYPE =
  386. "oauth2:https://www.googleapis.com/auth/userinfo.profile";
  387. - @Override
  388. - public void getAccessToken(Account account, IdentityManager.GetAccessTokenCallback callback) {
  389. - getIdentityManager().getAccessToken(account, AUTH_TOKEN_TYPE, callback);
  390. - }
  391. -
  392. @Override
  393. public void invalidateAccessToken(String accessToken) {
  394. - getIdentityManager().invalidateAccessToken(accessToken);
  395. - }
  396. -
  397. - private IdentityManager getIdentityManager() {
  398. - return IdentityServicesProvider.get().getIdentityManager(
  399. - Profile.getLastUsedRegularProfile());
  400. }
  401. }
  402. diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java
  403. --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java
  404. +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java
  405. @@ -14,7 +14,6 @@ import org.chromium.chrome.browser.IntentHandler;
  406. import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
  407. import org.chromium.chrome.browser.flags.ActivityType;
  408. import org.chromium.chrome.browser.profiles.Profile;
  409. -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
  410. import org.chromium.chrome.browser.tab.EmptyTabObserver;
  411. import org.chromium.chrome.browser.tab.Tab;
  412. import org.chromium.components.autofill_assistant.AssistantFeatures;
  413. @@ -88,8 +87,7 @@ public class AssistantDependencyUtilsChrome {
  414. }
  415. public static boolean isMakeSearchesAndBrowsingBetterSettingEnabled() {
  416. - return UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
  417. - Profile.getLastUsedRegularProfile());
  418. + return false;
  419. }
  420. private AssistantDependencyUtilsChrome() {}
  421. diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java
  422. --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java
  423. +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java
  424. @@ -10,49 +10,26 @@ import android.graphics.drawable.Drawable;
  425. import androidx.annotation.DimenRes;
  426. import org.chromium.base.ObserverList;
  427. -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
  428. import org.chromium.components.autofill_assistant.AssistantProfileImageUtil;
  429. /**
  430. * Implementation of {@link AssistantProfileImageUtil} for Chrome.
  431. */
  432. public class AssistantProfileImageUtilChrome
  433. - implements AssistantProfileImageUtil, ProfileDataCache.Observer {
  434. + implements AssistantProfileImageUtil {
  435. private final String mSignedInAccountEmail;
  436. - private final ProfileDataCache mProfileCache;
  437. private final ObserverList<Observer> mObservers = new ObserverList<>();
  438. public AssistantProfileImageUtilChrome(
  439. Context context, String signedInAccountEmail, @DimenRes int imageSizeRedId) {
  440. mSignedInAccountEmail = signedInAccountEmail;
  441. - mProfileCache = ProfileDataCache.createWithoutBadge(context, imageSizeRedId);
  442. }
  443. @Override
  444. public void addObserver(Observer observer) {
  445. - if (mObservers.isEmpty() && mObservers.addObserver(observer)) {
  446. - mProfileCache.addObserver(this);
  447. - }
  448. }
  449. @Override
  450. public void removeObserver(Observer observer) {
  451. - if (mObservers.removeObserver(observer) && mObservers.isEmpty()) {
  452. - mProfileCache.removeObserver(this);
  453. - }
  454. - }
  455. -
  456. - @Override
  457. - public void onProfileDataUpdated(String accountEmail) {
  458. - if (!mSignedInAccountEmail.equals(accountEmail)) {
  459. - return;
  460. - }
  461. -
  462. - Drawable profileImage =
  463. - mProfileCache.getProfileDataOrDefault(mSignedInAccountEmail).getImage();
  464. -
  465. - for (Observer observer : mObservers) {
  466. - observer.onProfileImageChanged(profileImage);
  467. - }
  468. }
  469. }
  470. diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java
  471. --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java
  472. +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java
  473. @@ -13,11 +13,9 @@ import androidx.annotation.Nullable;
  474. import org.chromium.base.annotations.JNINamespace;
  475. import org.chromium.base.annotations.NativeMethods;
  476. import org.chromium.chrome.browser.profiles.Profile;
  477. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  478. import org.chromium.chrome.browser.ui.TabObscuringHandler;
  479. import org.chromium.chrome.browser.ui.TabObscuringHandlerSupplier;
  480. import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
  481. -import org.chromium.components.autofill_assistant.AssistantAccessTokenUtil;
  482. import org.chromium.components.autofill_assistant.AssistantDependencies;
  483. import org.chromium.components.autofill_assistant.AssistantEditorFactory;
  484. import org.chromium.components.autofill_assistant.AssistantFeedbackUtil;
  485. @@ -92,11 +90,6 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende
  486. return new AssistantSettingsUtilChrome();
  487. }
  488. - @Override
  489. - public AssistantAccessTokenUtil createAccessTokenUtil() {
  490. - return new AssistantAccessTokenUtilChrome();
  491. - }
  492. -
  493. /**
  494. * Getter for the current profile while assistant is running. Since autofill assistant is only
  495. * available in regular mode and there is only one regular profile in android, this method
  496. @@ -129,10 +122,7 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende
  497. @Nullable
  498. public String getSignedInAccountEmailOrNull() {
  499. - IdentityManager identityManager =
  500. - IdentityServicesProvider.get().getIdentityManager(getProfile());
  501. - return CoreAccountInfo.getEmailFrom(
  502. - identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC));
  503. + return null;
  504. }
  505. @Override
  506. diff --git a/chrome/android/features/autofill_assistant/public/java_sources.gni b/chrome/android/features/autofill_assistant/public/java_sources.gni
  507. --- a/chrome/android/features/autofill_assistant/public/java_sources.gni
  508. +++ b/chrome/android/features/autofill_assistant/public/java_sources.gni
  509. @@ -3,7 +3,6 @@
  510. # found in the LICENSE file.
  511. public_autofill_assistant_java_sources = [
  512. - "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java",
  513. "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAddressEditorAutofill.java",
  514. "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillUtilChrome.java",
  515. "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java",
  516. diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
  517. --- a/chrome/android/features/tab_ui/BUILD.gn
  518. +++ b/chrome/android/features/tab_ui/BUILD.gn
  519. @@ -189,7 +189,6 @@ android_library("java") {
  520. "//chrome/browser/profiles/android:java",
  521. "//chrome/browser/search_engines/android:java",
  522. "//chrome/browser/share:java",
  523. - "//chrome/browser/signin/services/android:java",
  524. "//chrome/browser/tab:java",
  525. "//chrome/browser/tab_group:java",
  526. "//chrome/browser/tabmodel:java",
  527. 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
  528. --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
  529. +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
  530. @@ -12,12 +12,8 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  531. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  532. import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager;
  533. import org.chromium.chrome.browser.profiles.Profile;
  534. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  535. -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
  536. import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceConfig;
  537. -import org.chromium.chrome.browser.sync.SyncService;
  538. import org.chromium.chrome.browser.tabmodel.TabModel;
  539. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  540. import org.chromium.components.sync.ModelType;
  541. import java.util.concurrent.TimeUnit;
  542. @@ -212,20 +208,15 @@ public class PriceTrackingUtilities {
  543. }
  544. private static boolean isSignedIn() {
  545. - return IdentityServicesProvider.get()
  546. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  547. - .hasPrimaryAccount(ConsentLevel.SYNC);
  548. + return false;
  549. }
  550. private static boolean isOpenTabsSyncEnabled() {
  551. - SyncService syncService = SyncService.get();
  552. - return syncService != null && syncService.isSyncRequested()
  553. - && syncService.getActiveDataTypes().contains(ModelType.SESSIONS);
  554. + return false;
  555. }
  556. private static boolean isAnonymizedUrlDataCollectionEnabled() {
  557. - return UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
  558. - Profile.getLastUsedRegularProfile());
  559. + return false;
  560. }
  561. @VisibleForTesting
  562. diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
  563. --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
  564. +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
  565. @@ -18,9 +18,7 @@ import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcher;
  566. import org.chromium.chrome.browser.endpoint_fetcher.EndpointResponse;
  567. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  568. import org.chromium.chrome.browser.profiles.Profile;
  569. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  570. import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
  571. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  572. import org.chromium.net.NetworkTrafficAnnotationTag;
  573. import java.util.Collections;
  574. @@ -150,15 +148,7 @@ public class TabSuggestionsServerFetcher implements TabSuggestionsFetcher {
  575. // avoid fetching server if the TabGroupsAndroid flag is disabled. We need to move this
  576. // flag checking logic to somewhere if this server fetcher supports suggestions other than
  577. // grouping in the future.
  578. - return isSignedIn() && isServerFetcherFlagEnabled()
  579. - && TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext);
  580. - }
  581. -
  582. - @VisibleForTesting
  583. - protected boolean isSignedIn() {
  584. - return IdentityServicesProvider.get()
  585. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  586. - .hasPrimaryAccount(ConsentLevel.SYNC);
  587. + return false;
  588. }
  589. @VisibleForTesting
  590. 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
  591. --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
  592. +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
  593. @@ -48,7 +48,6 @@ import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImp
  594. import org.chromium.chrome.browser.profiles.Profile;
  595. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  596. import org.chromium.chrome.browser.share.ShareDelegate;
  597. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  598. import org.chromium.chrome.browser.tab.Tab;
  599. import org.chromium.chrome.browser.tab.TabSelectionType;
  600. import org.chromium.chrome.browser.tabmodel.TabModelObserver;
  601. @@ -69,7 +68,6 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
  602. import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
  603. import org.chromium.components.feature_engagement.EventConstants;
  604. import org.chromium.components.feature_engagement.Tracker;
  605. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  606. import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
  607. import org.chromium.ui.base.ViewUtils;
  608. import org.chromium.ui.base.WindowAndroid;
  609. @@ -707,17 +705,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
  610. return mSectionHeaderModel;
  611. }
  612. - /** @return The {@link View} for this class. */
  613. - View getSigninPromoView() {
  614. - if (mSigninPromoView == null) {
  615. - LayoutInflater inflater = LayoutInflater.from(mRootView.getContext());
  616. - mSigninPromoView = inflater.inflate(
  617. - R.layout.personalized_signin_promo_view_modern_content_suggestions, mRootView,
  618. - false);
  619. - }
  620. - return mSigninPromoView;
  621. - }
  622. -
  623. /**
  624. * Update header views in the Feed.
  625. */
  626. @@ -731,9 +718,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
  627. headers.add(mSectionHeaderView);
  628. - if (isSignInPromoVisible) {
  629. - headers.add(getSigninPromoView());
  630. - }
  631. setHeaders(headers);
  632. }
  633. @@ -742,11 +726,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
  634. return mMediator;
  635. }
  636. - @VisibleForTesting
  637. - public View getSignInPromoViewForTesting() {
  638. - return getSigninPromoView();
  639. - }
  640. -
  641. @VisibleForTesting
  642. public View getSectionHeaderViewForTesting() {
  643. return mSectionHeaderView;
  644. @@ -843,10 +822,7 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
  645. @Override
  646. public boolean isSignedIn() {
  647. - return IdentityServicesProvider.get()
  648. - .getSigninManager(Profile.getLastUsedRegularProfile())
  649. - .getIdentityManager()
  650. - .hasPrimaryAccount(ConsentLevel.SYNC);
  651. + return false;
  652. }
  653. @Override
  654. 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
  655. --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
  656. +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
  657. @@ -34,17 +34,12 @@ import org.chromium.chrome.browser.feed.sort_ui.FeedOptionsCoordinator;
  658. import org.chromium.chrome.browser.feed.v2.FeedUserActionType;
  659. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  660. import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
  661. -import org.chromium.chrome.browser.ntp.cards.SignInPromo;
  662. import org.chromium.chrome.browser.preferences.Pref;
  663. import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
  664. import org.chromium.chrome.browser.profiles.Profile;
  665. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  666. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  667. -import org.chromium.chrome.browser.signin.services.SigninManager;
  668. import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
  669. import org.chromium.chrome.browser.ui.native_page.TouchEnabledDelegate;
  670. -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
  671. -import org.chromium.chrome.browser.ui.signin.SigninPromoController;
  672. import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
  673. import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType;
  674. import org.chromium.components.browser_ui.widget.listmenu.ListMenu;
  675. @@ -52,10 +47,6 @@ import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties
  676. import org.chromium.components.feed.proto.wire.ReliabilityLoggingEnums.DiscoverLaunchResult;
  677. import org.chromium.components.prefs.PrefService;
  678. import org.chromium.components.search_engines.TemplateUrlService.TemplateUrlServiceObserver;
  679. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  680. -import org.chromium.components.signin.identitymanager.IdentityManager;
  681. -import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
  682. -import org.chromium.components.signin.metrics.SigninAccessPoint;
  683. import org.chromium.components.user_prefs.UserPrefs;
  684. import org.chromium.content_public.browser.LoadUrlParams;
  685. import org.chromium.ui.modelutil.MVCListAdapter;
  686. @@ -75,7 +66,7 @@ import java.util.Locale;
  687. @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
  688. public class FeedSurfaceMediator
  689. implements FeedSurfaceScrollDelegate, TouchEnabledDelegate, TemplateUrlServiceObserver,
  690. - ListMenu.Delegate, IdentityManager.Observer {
  691. + ListMenu.Delegate {
  692. private static final String TAG = "FeedSurfaceMediator";
  693. private static final int INTEREST_FEED_HEADER_POSITION = 0;
  694. @@ -130,50 +121,6 @@ public class FeedSurfaceMediator
  695. }
  696. }
  697. - /**
  698. - * The {@link SignInPromo} for the Feed.
  699. - * TODO(huayinz): Update content and visibility through a ModelChangeProcessor.
  700. - */
  701. - private class FeedSignInPromo extends SignInPromo {
  702. - FeedSignInPromo(SigninManager signinManager) {
  703. - super(signinManager);
  704. - maybeUpdateSignInPromo();
  705. - }
  706. -
  707. - @Override
  708. - protected void setVisibilityInternal(boolean visible) {
  709. - if (isVisible() == visible) return;
  710. -
  711. - super.setVisibilityInternal(visible);
  712. - mCoordinator.updateHeaderViews(visible);
  713. - maybeUpdateSignInPromo();
  714. - }
  715. -
  716. - @Override
  717. - protected void notifyDataChanged() {
  718. - maybeUpdateSignInPromo();
  719. - }
  720. -
  721. - /** Update the content displayed in {@link PersonalizedSigninPromoView}. */
  722. - private void maybeUpdateSignInPromo() {
  723. - // Only call #setupPromoViewFromCache() if SignInPromo is visible to avoid potentially
  724. - // blocking the UI thread for several seconds if the accounts cache is not populated
  725. - // yet.
  726. - if (isVisible()) {
  727. - mSigninPromoController.setUpSyncPromoView(mProfileDataCache,
  728. - mCoordinator.getSigninPromoView().findViewById(
  729. - R.id.signin_promo_view_container),
  730. - this::onDismissPromo);
  731. - }
  732. - }
  733. -
  734. - @Override
  735. - public void onDismissPromo() {
  736. - super.onDismissPromo();
  737. - mCoordinator.updateHeaderViews(false);
  738. - }
  739. - }
  740. -
  741. @VisibleForTesting
  742. static void setPrefForTest(PrefChangeRegistrar prefChangeRegistrar, PrefService prefService) {
  743. sTestPrefChangeRegistar = prefChangeRegistrar;
  744. @@ -187,7 +134,6 @@ public class FeedSurfaceMediator
  745. private final Context mContext;
  746. private final @Nullable SnapScrollHelper mSnapScrollHelper;
  747. private final PrefChangeRegistrar mPrefChangeRegistrar;
  748. - private final SigninManager mSigninManager;
  749. private final PropertyModel mSectionHeaderModel;
  750. private final FeedActionDelegate mActionDelegate;
  751. private final FeedOptionsCoordinator mOptionsCoordinator;
  752. @@ -196,7 +142,6 @@ public class FeedSurfaceMediator
  753. private final ObserverList<ScrollListener> mScrollListeners = new ObserverList<>();
  754. private ContentChangedListener mStreamContentChangedListener;
  755. private MemoryPressureCallback mMemoryPressureCallback;
  756. - private @Nullable SignInPromo mSignInPromo;
  757. private RecyclerViewAnimationFinishDetector mRecyclerViewAnimationFinishDetector =
  758. new RecyclerViewAnimationFinishDetector();
  759. @@ -237,8 +182,6 @@ public class FeedSurfaceMediator
  760. mCoordinator = coordinator;
  761. mContext = context;
  762. mSnapScrollHelper = snapScrollHelper;
  763. - mSigninManager = IdentityServicesProvider.get().getSigninManager(
  764. - Profile.getLastUsedRegularProfile());
  765. mActionDelegate = actionDelegate;
  766. mOptionsCoordinator = optionsCoordinator;
  767. @@ -394,7 +337,6 @@ public class FeedSurfaceMediator
  768. mFeedMenuModel = buildMenuItems();
  769. mCoordinator.initializeBubbleTriggering();
  770. - mSigninManager.getIdentityManager().addObserver(this);
  771. mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, mFeedMenuModel);
  772. mSectionHeaderModel.set(
  773. @@ -634,17 +576,7 @@ public class FeedSurfaceMediator
  774. * @return Whether the SignPromo should be visible.
  775. */
  776. private boolean shouldShowSigninPromo() {
  777. - SigninPromoController.resetNTPSyncPromoLimitsIfHiddenForTooLong();
  778. - if (!SignInPromo.shouldCreatePromo()
  779. - || !SigninPromoController.canShowSyncPromo(
  780. - SigninAccessPoint.NTP_CONTENT_SUGGESTIONS)) {
  781. - return false;
  782. - }
  783. - if (mSignInPromo == null) {
  784. - mSignInPromo = new FeedSignInPromo(mSigninManager);
  785. - mSignInPromo.setCanShowPersonalizedSuggestions(isSuggestionsVisible());
  786. - }
  787. - return mSignInPromo.isVisible();
  788. + return false;
  789. }
  790. /** Clear any dependencies related to the {@link Stream}. */
  791. @@ -659,11 +591,6 @@ public class FeedSurfaceMediator
  792. MemoryPressureListener.removeCallback(mMemoryPressureCallback);
  793. mMemoryPressureCallback = null;
  794. - if (mSignInPromo != null) {
  795. - mSignInPromo.destroy();
  796. - mSignInPromo = null;
  797. - }
  798. -
  799. unbindStream();
  800. for (Stream s : mTabToStreamMap.values()) {
  801. s.removeOnContentChangedListener(mStreamContentChangedListener);
  802. @@ -674,7 +601,6 @@ public class FeedSurfaceMediator
  803. mPrefChangeRegistrar.removeObserver(Pref.ARTICLES_LIST_VISIBLE);
  804. TemplateUrlServiceFactory.get().removeObserver(this);
  805. - mSigninManager.getIdentityManager().removeObserver(this);
  806. mSectionHeaderModel.get(SectionHeaderListProperties.SECTION_HEADERS_KEY).clear();
  807. @@ -745,9 +671,6 @@ public class FeedSurfaceMediator
  808. // Update toggleswitch item, which is last item in list.
  809. mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, buildMenuItems());
  810. - if (mSignInPromo != null) {
  811. - mSignInPromo.setCanShowPersonalizedSuggestions(suggestionsVisible);
  812. - }
  813. if (suggestionsVisible) mCoordinator.getSurfaceLifecycleManager().show();
  814. mStreamContentChanged = true;
  815. @@ -779,7 +702,7 @@ public class FeedSurfaceMediator
  816. }
  817. private boolean isSignedIn() {
  818. - return mSigninManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC);
  819. + return false;
  820. }
  821. /**
  822. @@ -1037,18 +960,6 @@ public class FeedSurfaceMediator
  823. }
  824. }
  825. - // IdentityManager.Observer interface.
  826. -
  827. - @Override
  828. - public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
  829. - updateSectionHeader();
  830. - }
  831. -
  832. - @VisibleForTesting
  833. - public SignInPromo getSignInPromoForTesting() {
  834. - return mSignInPromo;
  835. - }
  836. -
  837. public void manualRefresh(Callback<Boolean> callback) {
  838. if (mCurrentStream != null) {
  839. mCurrentStream.triggerRefresh(callback);
  840. diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
  841. --- a/chrome/android/java/AndroidManifest.xml
  842. +++ b/chrome/android/java/AndroidManifest.xml
  843. @@ -65,9 +65,7 @@ by a child template that "extends" this file.
  844. <uses-permission android:name="android.permission.CAMERA" />
  845. <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
  846. <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
  847. - <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
  848. <uses-permission android:name="android.permission.INTERNET"/>
  849. - <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
  850. <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
  851. <uses-permission android:name="android.permission.NFC"/>
  852. <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
  853. @@ -78,7 +76,6 @@ by a child template that "extends" this file.
  854. <uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_VIDEO"/>
  855. <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
  856. <uses-permission android:name="android.permission.RECORD_AUDIO"/>
  857. - <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
  858. <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
  859. <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
  860. <uses-permission android:name="android.permission.VIBRATE"/>
  861. @@ -123,8 +120,6 @@ by a child template that "extends" this file.
  862. <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
  863. <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  864. - <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
  865. -
  866. {% block extra_uses_permissions %}
  867. {% endblock %}
  868. @@ -529,15 +524,6 @@ by a child template that "extends" this file.
  869. TODO(crbug.com/1093292): investigate why
  870. @android:style/Theme.NoDisplay can't be used here.
  871. -->
  872. - <activity android:name="org.chromium.chrome.browser.sync.ui.SyncTrustedVaultProxyActivity"
  873. - android:theme="@style/Theme.MaterialComponents"
  874. - android:excludeFromRecents="true"
  875. - android:exported="false">
  876. - </activity>
  877. - <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"
  878. - android:theme="@style/Theme.Chromium.Activity"
  879. - android:autoRemoveFromRecents="true">
  880. - </activity>
  881. <activity android:name="org.chromium.chrome.browser.firstrun.LightweightFirstRunActivity"
  882. android:theme="@style/Theme.BrowserUI.AlertDialog.NoActionBar"
  883. android:launchMode="singleInstance"
  884. @@ -570,11 +556,6 @@ by a child template that "extends" this file.
  885. {{ self.supports_vr() }}
  886. </activity>
  887. {% endif %}
  888. - <activity android:name="org.chromium.chrome.browser.signin.SyncConsentActivity"
  889. - android:theme="@style/Theme.Chromium.DialogWhenLarge"
  890. - android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
  891. - android:exported="false">
  892. - </activity>
  893. <activity android:name="org.chromium.chrome.browser.settings.SettingsActivity"
  894. android:theme="@style/Theme.Chromium.Settings"
  895. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
  896. diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
  897. --- a/chrome/android/java/res/xml/google_services_preferences.xml
  898. +++ b/chrome/android/java/res/xml/google_services_preferences.xml
  899. @@ -24,11 +24,6 @@
  900. android:title="@string/autocomplete_searches_and_urls_title"
  901. android:summary="@string/autocomplete_searches_and_urls_summary"
  902. android:persistent="false"/>
  903. - <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
  904. - android:key="url_keyed_anonymized_data"
  905. - android:title="@string/url_keyed_anonymized_data_title"
  906. - android:summary="@string/url_keyed_anonymized_data_summary"
  907. - android:persistent="false"/>
  908. <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
  909. android:key="autofill_assistant"
  910. android:title="@string/prefs_autofill_assistant_title"
  911. diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
  912. --- a/chrome/android/java/res/xml/main_preferences.xml
  913. +++ b/chrome/android/java/res/xml/main_preferences.xml
  914. @@ -7,29 +7,11 @@
  915. xmlns:app="http://schemas.android.com/apk/res-auto"
  916. android:orderingFromXml="false">
  917. - <org.chromium.chrome.browser.sync.settings.SyncPromoPreference
  918. - android:key="sync_promo"
  919. - android:order="0"/>
  920. <PreferenceCategory
  921. android:key="account_and_google_services_section"
  922. android:order="1"
  923. - android:title="@string/prefs_section_account_and_google_services"/>
  924. - <org.chromium.chrome.browser.sync.settings.SignInPreference
  925. - android:key="sign_in"
  926. - android:order="2"
  927. - android:title="@string/sign_in_to_chrome"/>
  928. - <org.chromium.components.browser_ui.settings.ChromeBasePreference
  929. - android:key="manage_sync"
  930. - android:order="3"
  931. - android:layout="@layout/account_management_account_row"
  932. - android:title="@string/sync_category_title"/>
  933. - <org.chromium.components.browser_ui.settings.ChromeBasePreference
  934. - android:key="google_services"
  935. - android:order="4"
  936. - android:layout="@layout/account_management_account_row"
  937. - android:title="@string/prefs_google_services"
  938. - android:icon="@drawable/ic_google_services_48dp"
  939. - android:fragment="org.chromium.chrome.browser.sync.settings.GoogleServicesSettings"/>
  940. + android:title="@string/prefs_section_account_and_google_services"
  941. + app:isPreferenceVisible="false" />
  942. <PreferenceCategory
  943. android:key="basics_section"
  944. diff --git a/chrome/android/java/res/xml/manage_sync_preferences.xml b/chrome/android/java/res/xml/manage_sync_preferences.xml
  945. --- a/chrome/android/java/res/xml/manage_sync_preferences.xml
  946. +++ b/chrome/android/java/res/xml/manage_sync_preferences.xml
  947. @@ -85,16 +85,4 @@
  948. android:key="sync_review_data"
  949. android:title="@string/sync_review_data"/>
  950. - <!-- This category is only shown for advanced sync consent flow. -->
  951. - <PreferenceCategory
  952. - android:key="search_and_browse_category"
  953. - android:title="@string/search_and_browse_category"
  954. - app:isPreferenceVisible="false">
  955. -
  956. - <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
  957. - android:key="url_keyed_anonymized_data"
  958. - android:title="@string/url_keyed_anonymized_data_title"
  959. - android:summary="@string/url_keyed_anonymized_data_summary"/>
  960. - </PreferenceCategory>
  961. -
  962. </PreferenceScreen>
  963. diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
  964. --- a/chrome/android/java/res/xml/privacy_preferences.xml
  965. +++ b/chrome/android/java/res/xml/privacy_preferences.xml
  966. @@ -85,8 +85,4 @@
  967. android:title="@string/cablev2_paask_title"
  968. android:summary="@string/cablev2_paask_body"
  969. android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/>
  970. - <org.chromium.components.browser_ui.settings.TextMessagePreference
  971. - android:key="sync_and_services_link"
  972. - android:summary="@string/privacy_sync_and_services_link_legacy"
  973. - app:allowDividerBelow="false"/>
  974. </PreferenceScreen>
  975. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  976. --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  977. +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  978. @@ -34,9 +34,7 @@ import org.chromium.chrome.browser.password_manager.GooglePasswordManagerUIProvi
  979. import org.chromium.chrome.browser.policy.PolicyAuditor;
  980. import org.chromium.chrome.browser.rlz.RevenueStats;
  981. import org.chromium.chrome.browser.survey.SurveyController;
  982. -import org.chromium.chrome.browser.sync.TrustedVaultClient;
  983. import org.chromium.chrome.browser.tab.Tab;
  984. -import org.chromium.chrome.browser.ui.signin.GoogleActivityController;
  985. import org.chromium.chrome.browser.usage_stats.DigitalWellbeingClient;
  986. import org.chromium.chrome.browser.webapps.GooglePlayWebApkInstallDelegate;
  987. import org.chromium.chrome.browser.xsurface.ProcessScope;
  988. @@ -45,8 +43,6 @@ import org.chromium.chrome.modules.image_editor.ImageEditorModuleProvider;
  989. import org.chromium.components.external_intents.AuthenticatorNavigationInterceptor;
  990. import org.chromium.components.policy.AppRestrictionsProvider;
  991. import org.chromium.components.policy.CombinedPolicyProvider;
  992. -import org.chromium.components.signin.AccountManagerDelegate;
  993. -import org.chromium.components.signin.SystemAccountManagerDelegate;
  994. import org.chromium.components.webapps.AppDetailsDelegate;
  995. import java.util.Collections;
  996. @@ -77,14 +73,6 @@ public abstract class AppHooks {
  997. return sInstance;
  998. }
  999. - /**
  1000. - * Creates a new {@link AccountManagerDelegate}.
  1001. - * @return the created {@link AccountManagerDelegate}.
  1002. - */
  1003. - public AccountManagerDelegate createAccountManagerDelegate() {
  1004. - return new SystemAccountManagerDelegate();
  1005. - }
  1006. -
  1007. /**
  1008. * @return An instance of AppDetailsDelegate that can be queried about app information for the
  1009. * App Banner feature. Will be null if one is unavailable.
  1010. @@ -140,13 +128,6 @@ public abstract class AppHooks {
  1011. return new FeedbackReporter() {};
  1012. }
  1013. - /**
  1014. - * @return An instance of GoogleActivityController.
  1015. - */
  1016. - public GoogleActivityController createGoogleActivityController() {
  1017. - return new GoogleActivityController();
  1018. - }
  1019. -
  1020. /**
  1021. * @return An instance of {@link GSAHelper} that handles the start point of chrome's integration
  1022. * with GSA.
  1023. @@ -279,13 +260,6 @@ public abstract class AppHooks {
  1024. return ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED;
  1025. }
  1026. - /**
  1027. - * Returns a new {@link TrustedVaultClient.Backend} instance.
  1028. - */
  1029. - public TrustedVaultClient.Backend createSyncTrustedVaultClientBackend() {
  1030. - return new TrustedVaultClient.EmptyBackend();
  1031. - }
  1032. -
  1033. /**
  1034. * This is deprecated, and should not be called. Use FeedHooks instead.
  1035. */
  1036. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java
  1037. --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java
  1038. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java
  1039. @@ -27,7 +27,6 @@ import org.chromium.chrome.browser.init.AsyncInitTaskRunner;
  1040. import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
  1041. import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  1042. import org.chromium.chrome.browser.profiles.Profile;
  1043. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1044. import org.chromium.components.signin.AccountManagerFacadeProvider;
  1045. import org.chromium.components.signin.AccountUtils;
  1046. import org.chromium.components.signin.base.CoreAccountInfo;
  1047. @@ -179,7 +178,6 @@ public class ChromeBackupAgentImpl extends ChromeBackupAgent.Impl {
  1048. ParcelFileDescriptor newState) throws IOException {
  1049. final ArrayList<String> backupNames = new ArrayList<>();
  1050. final ArrayList<byte[]> backupValues = new ArrayList<>();
  1051. - final AtomicReference<CoreAccountInfo> syncAccount = new AtomicReference<>();
  1052. // The native preferences can only be read on the UI thread.
  1053. Boolean nativePrefsRead = PostTask.runSynchronously(UiThreadTaskTraits.DEFAULT, () -> {
  1054. @@ -188,10 +186,6 @@ public class ChromeBackupAgentImpl extends ChromeBackupAgent.Impl {
  1055. // immediately, so by the time it does Chrome may not be running.
  1056. if (!initializeBrowser()) return false;
  1057. - syncAccount.set(IdentityServicesProvider.get()
  1058. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  1059. - .getPrimaryAccountInfo(ConsentLevel.SYNC));
  1060. -
  1061. String[] nativeBackupNames = ChromeBackupAgentImplJni.get().getBoolBackupNames(this);
  1062. boolean[] nativeBackupValues = ChromeBackupAgentImplJni.get().getBoolBackupValues(this);
  1063. assert nativeBackupNames.length == nativeBackupValues.length;
  1064. @@ -245,8 +239,7 @@ public class ChromeBackupAgentImpl extends ChromeBackupAgent.Impl {
  1065. // Finally add the user id.
  1066. backupNames.add(ANDROID_DEFAULT_PREFIX + SIGNED_IN_ACCOUNT_KEY);
  1067. - backupValues.add(ApiCompatibilityUtils.getBytesUtf8(
  1068. - syncAccount.get() == null ? "" : syncAccount.get().getEmail()));
  1069. + backupValues.add(ApiCompatibilityUtils.getBytesUtf8(""));
  1070. BackupState newBackupState = new BackupState(backupNames, backupValues);
  1071. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
  1072. --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
  1073. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
  1074. @@ -16,9 +16,6 @@ import org.chromium.base.annotations.JNINamespace;
  1075. import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  1076. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  1077. import org.chromium.chrome.browser.profiles.Profile;
  1078. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1079. -import org.chromium.components.signin.identitymanager.IdentityManager;
  1080. -import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
  1081. /**
  1082. * Class for watching for changes to the Android preferences that are backed up using Android
  1083. @@ -57,15 +54,6 @@ public class ChromeBackupWatcher {
  1084. }
  1085. }
  1086. });
  1087. - // Update the backup if the sign-in status changes.
  1088. - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
  1089. - Profile.getLastUsedRegularProfile());
  1090. - identityManager.addObserver(new IdentityManager.Observer() {
  1091. - @Override
  1092. - public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
  1093. - onBackupPrefsChanged();
  1094. - }
  1095. - });
  1096. }
  1097. @CalledByNative
  1098. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  1099. --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  1100. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  1101. @@ -85,7 +85,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
  1102. import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
  1103. import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils;
  1104. import org.chromium.chrome.browser.feed.FeedSurfaceTracker;
  1105. -import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
  1106. import org.chromium.chrome.browser.flags.ActivityType;
  1107. import org.chromium.chrome.browser.flags.CachedFeatureFlags;
  1108. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  1109. @@ -100,7 +99,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup;
  1110. import org.chromium.chrome.browser.incognito.IncognitoTabLauncher;
  1111. import org.chromium.chrome.browser.incognito.IncognitoTabSnapshotController;
  1112. import org.chromium.chrome.browser.incognito.IncognitoUtils;
  1113. -import org.chromium.chrome.browser.infobar.SyncErrorInfoBar;
  1114. import org.chromium.chrome.browser.layouts.LayoutStateProvider;
  1115. import org.chromium.chrome.browser.layouts.LayoutType;
  1116. import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
  1117. @@ -135,9 +133,6 @@ import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification
  1118. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  1119. import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;
  1120. import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
  1121. -import org.chromium.chrome.browser.survey.ChromeSurveyController;
  1122. -import org.chromium.chrome.browser.sync.ui.SyncErrorMessage;
  1123. -import org.chromium.chrome.browser.sync.ui.SyncErrorPromptUtils;
  1124. import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper;
  1125. import org.chromium.chrome.browser.tab.Tab;
  1126. import org.chromium.chrome.browser.tab.TabAssociatedApp;
  1127. @@ -671,9 +666,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  1128. }
  1129. private void refreshSignIn() {
  1130. - try (TraceEvent e = TraceEvent.scoped("ChromeTabbedActivity.refreshSignIn")) {
  1131. - FirstRunSignInProcessor.start(this);
  1132. - }
  1133. }
  1134. private void setupCompositorContentPreNativeForPhone() {
  1135. @@ -1859,14 +1851,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  1136. if (!navigation.hasCommitted() || !navigation.isInPrimaryMainFrame()) {
  1137. return;
  1138. }
  1139. - try (TraceEvent e = TraceEvent.scoped("CheckSyncErrorOnDidFinishNavigation")) {
  1140. - if (SyncErrorPromptUtils.isMessageUiEnabled()) {
  1141. - SyncErrorMessage.maybeShowMessageUi(
  1142. - getWindowAndroid(), ChromeTabbedActivity.this);
  1143. - } else {
  1144. - SyncErrorInfoBar.maybeLaunchSyncErrorInfoBar(tab.getWebContents());
  1145. - }
  1146. - }
  1147. try (TraceEvent te = TraceEvent.scoped("updateActiveWebContents")) {
  1148. SendTabToSelfAndroidBridge.updateActiveWebContents(tab.getWebContents());
  1149. }
  1150. @@ -1959,9 +1943,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  1151. LauncherShortcutActivity.updateIncognitoShortcut(ChromeTabbedActivity.this);
  1152. - ChromeSurveyController.initialize(mTabModelSelector, getLifecycleDispatcher(),
  1153. - ChromeTabbedActivity.this, MessageDispatcherProvider.from(getWindowAndroid()));
  1154. -
  1155. if (mStartSurfaceSupplier.get() != null) {
  1156. // The tab switcher is not the layout shown on startup, so wait until it is shown
  1157. // before notifying the start surface that is was.
  1158. 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
  1159. --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  1160. +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  1161. @@ -105,7 +105,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
  1162. import org.chromium.chrome.browser.download.items.OfflineContentAggregatorNotificationBridgeUiFactory;
  1163. import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
  1164. import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
  1165. -import org.chromium.chrome.browser.firstrun.ForcedSigninProcessor;
  1166. import org.chromium.chrome.browser.flags.ActivityType;
  1167. import org.chromium.chrome.browser.flags.CachedFeatureFlags;
  1168. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  1169. @@ -154,7 +153,6 @@ import org.chromium.chrome.browser.share.ShareDelegateImpl;
  1170. import org.chromium.chrome.browser.share.ShareDelegateSupplier;
  1171. import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
  1172. import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
  1173. -import org.chromium.chrome.browser.sync.SyncService;
  1174. import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  1175. import org.chromium.chrome.browser.tab.RequestDesktopUtils;
  1176. import org.chromium.chrome.browser.tab.Tab;
  1177. @@ -216,8 +214,6 @@ import org.chromium.components.page_info.PageInfoController.OpenedFromSource;
  1178. import org.chromium.components.policy.CombinedPolicyProvider;
  1179. import org.chromium.components.policy.CombinedPolicyProvider.PolicyChangeListener;
  1180. import org.chromium.components.profile_metrics.BrowserProfileType;
  1181. -import org.chromium.components.sync.ModelType;
  1182. -import org.chromium.components.sync.PassphraseType;
  1183. import org.chromium.components.user_prefs.UserPrefs;
  1184. import org.chromium.components.webapk.lib.client.WebApkValidator;
  1185. import org.chromium.components.webapps.AddToHomescreenCoordinator;
  1186. @@ -312,9 +308,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  1187. private boolean mRemoveWindowBackgroundDone;
  1188. protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler;
  1189. - // Observes when sync becomes ready to create the mContextReporter.
  1190. - private SyncService.SyncStateChangedListener mSyncStateChangedListener;
  1191. -
  1192. // The PictureInPictureController is initialized lazily https://crbug.com/729738.
  1193. private PictureInPictureController mPictureInPictureController;
  1194. @@ -1041,61 +1034,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  1195. return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR;
  1196. }
  1197. - private void createContextReporterIfNeeded() {
  1198. - if (!mStarted) return; // Sync state reporting should work only in started state.
  1199. - if (mContextReporter != null || getActivityTab() == null) return;
  1200. -
  1201. - final SyncService syncService = SyncService.get();
  1202. -
  1203. - if (syncService != null && syncService.isSyncingUrlsWithKeystorePassphrase()) {
  1204. - ContextReporter.SelectionReporter controller =
  1205. - getContextualSearchManagerSupplier().hasValue() ? new ContextReporter.SelectionReporter() {
  1206. - @Override
  1207. - public void enable(Callback<GSAContextDisplaySelection> callback) {
  1208. - getContextualSearchManagerSupplier().get().enableContextReporting(
  1209. - callback);
  1210. - }
  1211. -
  1212. - @Override
  1213. - public void disable() {
  1214. - getContextualSearchManagerSupplier().get().disableContextReporting();
  1215. - }
  1216. - } : null;
  1217. - mContextReporter = AppHooks.get().createGsaHelper().getContextReporter(
  1218. - getActivityTabProvider(), mTabModelSelectorSupplier, controller);
  1219. -
  1220. - if (mSyncStateChangedListener != null) {
  1221. - syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
  1222. - mSyncStateChangedListener = null;
  1223. - }
  1224. -
  1225. - return;
  1226. - } else {
  1227. - reportSyncStatus(syncService);
  1228. - }
  1229. -
  1230. - if (mSyncStateChangedListener == null && syncService != null) {
  1231. - mSyncStateChangedListener = () -> createContextReporterIfNeeded();
  1232. - syncService.addSyncStateChangedListener(mSyncStateChangedListener);
  1233. - }
  1234. - }
  1235. -
  1236. - /**
  1237. - * Records an appropriate status via UMA given the current sync status.
  1238. - */
  1239. - private static void reportSyncStatus(@Nullable SyncService syncService) {
  1240. - if (syncService == null || !syncService.isEngineInitialized()) {
  1241. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_INITIALIZED);
  1242. - } else if (!syncService.getActiveDataTypes().contains(ModelType.TYPED_URLS)) {
  1243. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_SYNCING_URLS);
  1244. - } else if (syncService.getPassphraseType() != PassphraseType.KEYSTORE_PASSPHRASE
  1245. - && syncService.getPassphraseType() != PassphraseType.TRUSTED_VAULT_PASSPHRASE) {
  1246. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_KEYSTORE_PASSPHRASE);
  1247. - } else {
  1248. - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_OTHER);
  1249. - }
  1250. - }
  1251. -
  1252. @Override
  1253. public void onResumeWithNative() {
  1254. // TODO(b/182286787): Clean-up once fixed session resume order is verified.
  1255. @@ -1229,14 +1167,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  1256. if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
  1257. if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect();
  1258. }
  1259. - if (mSyncStateChangedListener != null) {
  1260. - SyncService syncService = SyncService.get();
  1261. - if (syncService != null) {
  1262. - syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
  1263. - }
  1264. - mSyncStateChangedListener = null;
  1265. - }
  1266. - if (mContextReporter != null) mContextReporter.disable();
  1267. super.onStopWithNative();
  1268. }
  1269. @@ -1327,11 +1257,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  1270. .recordUserFontPrefOnStartup();
  1271. });
  1272. - DeferredStartupHandler.getInstance().addDeferredTask(() -> {
  1273. - if (isActivityFinishingOrDestroyed()) return;
  1274. - ForcedSigninProcessor.checkCanSignIn(ChromeActivity.this);
  1275. - });
  1276. -
  1277. // GSA connection is not needed on low-end devices because Icing is disabled.
  1278. if (!SysUtils.isLowEndDevice()) {
  1279. if (isActivityFinishingOrDestroyed()) return;
  1280. @@ -1346,7 +1271,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  1281. GSAAccountChangeListener.create(AppHooks.get().createGsaHelper());
  1282. }
  1283. mGSAAccountChangeListener.connect();
  1284. - createContextReporterIfNeeded();
  1285. });
  1286. }
  1287. }
  1288. 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
  1289. --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
  1290. +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
  1291. @@ -18,8 +18,6 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  1292. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  1293. import org.chromium.chrome.browser.profiles.Profile;
  1294. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  1295. -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
  1296. -import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
  1297. import org.chromium.components.autofill_assistant.AssistantFeatures;
  1298. import org.chromium.components.autofill_assistant.AutofillAssistantPreferencesUtil;
  1299. import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  1300. @@ -53,7 +51,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
  1301. private ChromeSwitchPreference mAutofillAssistantPreference;
  1302. private ChromeSwitchPreference mProactiveHelpPreference;
  1303. private ChromeSwitchPreference mAssistantVoiceSearchEnabledPref;
  1304. - private Preference mGoogleServicesSettingsLink;
  1305. @Override
  1306. public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  1307. @@ -89,15 +86,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
  1308. mProactiveHelpPreference.setVisible(false);
  1309. }
  1310. - mGoogleServicesSettingsLink = findPreference(PREF_GOOGLE_SERVICES_SETTINGS_LINK);
  1311. - NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getContext(), view -> {
  1312. - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  1313. - settingsLauncher.launchSettingsActivity(requireContext(), GoogleServicesSettings.class);
  1314. - });
  1315. - mGoogleServicesSettingsLink.setSummary(
  1316. - SpanApplier.applySpans(getString(R.string.prefs_proactive_help_sync_link),
  1317. - new SpanApplier.SpanInfo("<link>", "</link>", linkSpan)));
  1318. -
  1319. PreferenceCategory assistantVoiceSearchCategory =
  1320. findPreference(PREF_ASSISTANT_VOICE_SEARCH_CATEGORY);
  1321. mAssistantVoiceSearchEnabledPref =
  1322. @@ -145,9 +133,7 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
  1323. boolean assistant_switch_on_or_missing =
  1324. !mAutofillAssistantPreference.isVisible() || autofill_assistant_enabled;
  1325. - boolean url_keyed_anonymized_data_collection_enabled =
  1326. - UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
  1327. - Profile.getLastUsedRegularProfile());
  1328. + boolean url_keyed_anonymized_data_collection_enabled = false;
  1329. boolean proactive_help_on =
  1330. AutofillAssistantPreferencesUtil.getProactiveHelpPreference(true);
  1331. @@ -163,7 +149,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
  1332. }
  1333. mProactiveHelpPreference.setEnabled(proactive_toggle_enabled);
  1334. mProactiveHelpPreference.setChecked(proactive_toggle_enabled && proactive_help_on);
  1335. - mGoogleServicesSettingsLink.setVisible(show_disclaimer);
  1336. mAssistantVoiceSearchEnabledPref.setChecked(mSharedPreferencesManager.readBoolean(
  1337. ChromePreferenceKeys.ASSISTANT_VOICE_SEARCH_ENABLED, /* default= */ false));
  1338. 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
  1339. --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
  1340. +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
  1341. @@ -32,10 +32,7 @@ import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkType;
  1342. import org.chromium.chrome.browser.profiles.Profile;
  1343. import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
  1344. import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
  1345. -import org.chromium.chrome.browser.sync.SyncService;
  1346. import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  1347. -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
  1348. -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
  1349. import org.chromium.components.bookmarks.BookmarkId;
  1350. import org.chromium.components.bookmarks.BookmarkType;
  1351. import org.chromium.components.browser_ui.util.GlobalDiscardableReferencePool;
  1352. @@ -55,7 +52,7 @@ import java.util.List;
  1353. * BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there.
  1354. */
  1355. class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1356. - implements BookmarkUIObserver, SyncService.SyncStateChangedListener {
  1357. + implements BookmarkUIObserver {
  1358. private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
  1359. private static final String EMPTY_QUERY = null;
  1360. @@ -68,10 +65,8 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1361. @ViewType
  1362. private int mPromoHeaderType = ViewType.INVALID;
  1363. private BookmarkDelegate mDelegate;
  1364. - private BookmarkPromoHeader mPromoHeaderManager;
  1365. private String mSearchText;
  1366. private BookmarkId mCurrentFolder;
  1367. - private SyncService mSyncService;
  1368. private CommerceSubscriptionsServiceFactory mCommerceSubscriptionsServiceFactory;
  1369. // Keep track of the currently highlighted bookmark - used for "show in folder" action.
  1370. @@ -127,8 +122,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1371. BookmarkItemsAdapter(Context context, SnackbarManager snackbarManager) {
  1372. super(context);
  1373. - mSyncService = SyncService.get();
  1374. - mSyncService.addSyncStateChangedListener(this);
  1375. mImageFetcher =
  1376. ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE,
  1377. @@ -242,9 +235,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1378. case ViewType.PERSONALIZED_SIGNIN_PROMO:
  1379. // fall through
  1380. case ViewType.PERSONALIZED_SYNC_PROMO:
  1381. - return mPromoHeaderManager.createPersonalizedSigninAndSyncPromoHolder(parent);
  1382. + return null;
  1383. case ViewType.SYNC_PROMO:
  1384. - return mPromoHeaderManager.createSyncPromoHolder(parent);
  1385. + return null;
  1386. case ViewType.SECTION_HEADER:
  1387. return createSectionHeaderViewHolder(parent, viewType);
  1388. case ViewType.FOLDER:
  1389. @@ -280,10 +273,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1390. public void onBindViewHolder(ViewHolder holder, int position) {
  1391. if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO
  1392. || holder.getItemViewType() == ViewType.PERSONALIZED_SYNC_PROMO) {
  1393. - PersonalizedSigninPromoView view =
  1394. - (PersonalizedSigninPromoView) holder.itemView.findViewById(
  1395. - R.id.signin_promo_view_container);
  1396. - mPromoHeaderManager.setUpSyncPromoView(view);
  1397. } else if (holder.getItemViewType() == ViewType.SECTION_HEADER) {
  1398. bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position));
  1399. } else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) {
  1400. @@ -344,7 +333,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1401. case ViewType.PERSONALIZED_SIGNIN_PROMO:
  1402. // fall through
  1403. case ViewType.PERSONALIZED_SYNC_PROMO:
  1404. - mPromoHeaderManager.detachPersonalizePromoView();
  1405. break;
  1406. default:
  1407. // Other view holders don't have special recycling code.
  1408. @@ -367,7 +355,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1409. updateHeader(true);
  1410. };
  1411. - mPromoHeaderManager = new BookmarkPromoHeader(mContext, promoHeaderChangeAction);
  1412. populateTopLevelFoldersList();
  1413. mElements = new ArrayList<>();
  1414. @@ -382,8 +369,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1415. mDelegate.getModel().removeObserver(mBookmarkModelObserver);
  1416. mDelegate.getSelectionDelegate().removeObserver(this);
  1417. mDelegate = null;
  1418. - mPromoHeaderManager.destroy();
  1419. - mSyncService.removeSyncStateChangedListener(this);
  1420. }
  1421. @Override
  1422. @@ -478,18 +463,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1423. setOrder(mElements);
  1424. }
  1425. - // SyncStateChangedListener implementation.
  1426. - @Override
  1427. - public void syncStateChanged() {
  1428. - // If mDelegate is null, we will set the top level folders upon its initialization
  1429. - // (see onBookmarkDelegateInitialized method above).
  1430. - if (mDelegate == null) {
  1431. - return;
  1432. - }
  1433. - mTopLevelFolders.clear();
  1434. - populateTopLevelFoldersList();
  1435. - }
  1436. -
  1437. /**
  1438. * Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the
  1439. * promo header. This 0th index is null iff there is a promo header.
  1440. @@ -510,22 +483,7 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1441. } else if (currentUIState == BookmarkUIState.STATE_SEARCHING) {
  1442. mPromoHeaderType = ViewType.INVALID;
  1443. } else {
  1444. - switch (mPromoHeaderManager.getPromoState()) {
  1445. - case SyncPromoState.NO_PROMO:
  1446. mPromoHeaderType = ViewType.INVALID;
  1447. - break;
  1448. - case SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE:
  1449. - mPromoHeaderType = ViewType.PERSONALIZED_SIGNIN_PROMO;
  1450. - break;
  1451. - case SyncPromoState.PROMO_FOR_SIGNED_IN_STATE:
  1452. - mPromoHeaderType = ViewType.PERSONALIZED_SYNC_PROMO;
  1453. - break;
  1454. - case SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE:
  1455. - mPromoHeaderType = ViewType.SYNC_PROMO;
  1456. - break;
  1457. - default:
  1458. - assert false : "Unexpected value for promo state!";
  1459. - }
  1460. }
  1461. boolean willShowPromo = hasPromoHeader();
  1462. @@ -648,7 +606,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
  1463. @VisibleForTesting
  1464. void simulateSignInForTests() {
  1465. - syncStateChanged();
  1466. onFolderStateSet(mCurrentFolder);
  1467. }
  1468. 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
  1469. --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
  1470. +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
  1471. @@ -18,43 +18,18 @@ import org.chromium.chrome.R;
  1472. import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  1473. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  1474. import org.chromium.chrome.browser.profiles.Profile;
  1475. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  1476. -import org.chromium.chrome.browser.signin.SyncPromoView;
  1477. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1478. -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
  1479. -import org.chromium.chrome.browser.signin.services.SigninManager;
  1480. -import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
  1481. -import org.chromium.chrome.browser.sync.SyncService;
  1482. -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
  1483. -import org.chromium.chrome.browser.ui.signin.SigninPromoController;
  1484. -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
  1485. -import org.chromium.components.signin.AccountManagerFacade;
  1486. -import org.chromium.components.signin.AccountManagerFacadeProvider;
  1487. -import org.chromium.components.signin.AccountsChangeObserver;
  1488. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  1489. -import org.chromium.components.signin.metrics.SigninAccessPoint;
  1490. /**
  1491. * Class that manages all the logic and UI behind the signin promo header in the bookmark
  1492. * content UI. The header is shown only on certain situations, (e.g., not signed in).
  1493. */
  1494. -class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignInStateObserver,
  1495. - ProfileDataCache.Observer, AccountsChangeObserver {
  1496. +class BookmarkPromoHeader {
  1497. // TODO(kkimlabs): Figure out the optimal number based on UMA data.
  1498. private static final int MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT = 10;
  1499. - private static @Nullable @SyncPromoState Integer sPromoStateForTests;
  1500. -
  1501. private final Context mContext;
  1502. - private final SigninManager mSignInManager;
  1503. - private final AccountManagerFacade mAccountManagerFacade;
  1504. private final Runnable mPromoHeaderChangeAction;
  1505. - private @Nullable ProfileDataCache mProfileDataCache;
  1506. - private final @Nullable SigninPromoController mSigninPromoController;
  1507. - private @SyncPromoState int mPromoState = SyncPromoState.NO_PROMO;
  1508. - private final @Nullable SyncService mSyncService;
  1509. -
  1510. /**
  1511. * Initializes the class. Note that this will start listening to signin related events and
  1512. * update itself if needed.
  1513. @@ -62,200 +37,22 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
  1514. BookmarkPromoHeader(Context context, Runnable promoHeaderChangeAction) {
  1515. mContext = context;
  1516. mPromoHeaderChangeAction = promoHeaderChangeAction;
  1517. -
  1518. - mSyncService = SyncService.get();
  1519. - if (mSyncService != null) mSyncService.addSyncStateChangedListener(this);
  1520. -
  1521. - mSignInManager = IdentityServicesProvider.get().getSigninManager(
  1522. - Profile.getLastUsedRegularProfile());
  1523. - mSignInManager.addSignInStateObserver(this);
  1524. -
  1525. - mAccountManagerFacade = AccountManagerFacadeProvider.getInstance();
  1526. -
  1527. - if (SigninPromoController.canShowSyncPromo(SigninAccessPoint.BOOKMARK_MANAGER)) {
  1528. - mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(mContext);
  1529. - mProfileDataCache.addObserver(this);
  1530. - mSigninPromoController = new SigninPromoController(
  1531. - SigninAccessPoint.BOOKMARK_MANAGER, SyncConsentActivityLauncherImpl.get());
  1532. - mAccountManagerFacade.addObserver(this);
  1533. - } else {
  1534. - mProfileDataCache = null;
  1535. - mSigninPromoController = null;
  1536. - }
  1537. - updatePromoState();
  1538. }
  1539. /**
  1540. * Clean ups the class. Must be called once done using this class.
  1541. */
  1542. void destroy() {
  1543. - if (mSyncService != null) mSyncService.removeSyncStateChangedListener(this);
  1544. -
  1545. - if (mSigninPromoController != null) {
  1546. - mAccountManagerFacade.removeObserver(this);
  1547. - mProfileDataCache.removeObserver(this);
  1548. - mSigninPromoController.onPromoDestroyed();
  1549. - }
  1550. -
  1551. - mSignInManager.removeSignInStateObserver(this);
  1552. - }
  1553. -
  1554. - /**
  1555. - * @return The current state of the promo.
  1556. - */
  1557. - @SyncPromoState
  1558. - int getPromoState() {
  1559. - return mPromoState;
  1560. - }
  1561. -
  1562. - /**
  1563. - * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
  1564. - * {@link RecyclerView}.
  1565. - */
  1566. - ViewHolder createPersonalizedSigninAndSyncPromoHolder(ViewGroup parent) {
  1567. - View view = LayoutInflater.from(mContext).inflate(
  1568. - R.layout.personalized_signin_promo_view_bookmarks, parent, false);
  1569. -
  1570. - // ViewHolder is abstract and it cannot be instantiated directly.
  1571. - return new ViewHolder(view) {};
  1572. - }
  1573. -
  1574. - /**
  1575. - * @return Sync promo header {@link ViewHolder} instance that can be used with
  1576. - * {@link RecyclerView}.
  1577. - */
  1578. - ViewHolder createSyncPromoHolder(ViewGroup parent) {
  1579. - SyncPromoView view = SyncPromoView.create(parent, SigninAccessPoint.BOOKMARK_MANAGER);
  1580. -
  1581. - // ViewHolder is abstract and it cannot be instantiated directly.
  1582. - return new ViewHolder(view) {};
  1583. - }
  1584. -
  1585. - /**
  1586. - * Sets up the sync promo view.
  1587. - */
  1588. - void setUpSyncPromoView(PersonalizedSigninPromoView view) {
  1589. - mSigninPromoController.setUpSyncPromoView(
  1590. - mProfileDataCache, view, this::setPersonalizedSigninPromoDeclined);
  1591. - }
  1592. -
  1593. - /**
  1594. - * Detaches the previously configured {@link PersonalizedSigninPromoView}.
  1595. - */
  1596. - void detachPersonalizePromoView() {
  1597. - if (mSigninPromoController != null) mSigninPromoController.detach();
  1598. - }
  1599. -
  1600. - /**
  1601. - * Saves that the personalized signin promo was declined and updates the UI.
  1602. - */
  1603. - private void setPersonalizedSigninPromoDeclined() {
  1604. - mPromoState = calculatePromoState();
  1605. - triggerPromoUpdate();
  1606. }
  1607. /**
  1608. * @return Whether the personalized signin promo should be shown to user.
  1609. */
  1610. private boolean shouldShowBookmarkSigninPromo() {
  1611. - return mSignInManager.isSyncOptInAllowed()
  1612. - && SigninPromoController.canShowSyncPromo(SigninAccessPoint.BOOKMARK_MANAGER);
  1613. - }
  1614. -
  1615. - private @SyncPromoState int calculatePromoState() {
  1616. - if (sPromoStateForTests != null) {
  1617. - return sPromoStateForTests;
  1618. - }
  1619. -
  1620. - if (mSyncService == null) {
  1621. - // |mSyncService| will remain null until the next browser startup, so no sense in
  1622. - // offering any promo.
  1623. - return SyncPromoState.NO_PROMO;
  1624. - }
  1625. -
  1626. - if (!mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC)) {
  1627. - if (!shouldShowBookmarkSigninPromo()) {
  1628. - return SyncPromoState.NO_PROMO;
  1629. - }
  1630. -
  1631. - return mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SIGNIN)
  1632. - ? SyncPromoState.PROMO_FOR_SIGNED_IN_STATE
  1633. - : SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE;
  1634. - }
  1635. -
  1636. - boolean impressionLimitNotReached =
  1637. - SharedPreferencesManager.getInstance().readInt(
  1638. - ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT)
  1639. - < MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT;
  1640. - if (!mSyncService.isSyncRequested() && impressionLimitNotReached) {
  1641. - return SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE;
  1642. - }
  1643. - return SyncPromoState.NO_PROMO;
  1644. - }
  1645. -
  1646. - private void updatePromoState() {
  1647. - final @SyncPromoState int newState = calculatePromoState();
  1648. - if (newState == mPromoState) return;
  1649. -
  1650. - // PROMO_SYNC state and it's impression counts is not tracked by SigninPromoController.
  1651. - final boolean hasSyncPromoStateChangedtoShown =
  1652. - (mPromoState == SyncPromoState.NO_PROMO
  1653. - || mPromoState == SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE)
  1654. - && (newState == SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE
  1655. - || newState == SyncPromoState.PROMO_FOR_SIGNED_IN_STATE);
  1656. - if (mSigninPromoController != null && hasSyncPromoStateChangedtoShown) {
  1657. - mSigninPromoController.increasePromoShowCount();
  1658. - }
  1659. - if (newState == SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE) {
  1660. - SharedPreferencesManager.getInstance().incrementInt(
  1661. - ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT);
  1662. - }
  1663. - mPromoState = newState;
  1664. - }
  1665. -
  1666. - // SyncService.SyncStateChangedListener implementation.
  1667. - @Override
  1668. - public void syncStateChanged() {
  1669. - updatePromoState();
  1670. - triggerPromoUpdate();
  1671. - }
  1672. -
  1673. - // SignInStateObserver implementation.
  1674. - @Override
  1675. - public void onSignedIn() {
  1676. - updatePromoState();
  1677. - triggerPromoUpdate();
  1678. - }
  1679. -
  1680. - @Override
  1681. - public void onSignedOut() {
  1682. - updatePromoState();
  1683. - triggerPromoUpdate();
  1684. - }
  1685. -
  1686. - // ProfileDataCache.Observer implementation.
  1687. - @Override
  1688. - public void onProfileDataUpdated(String accountEmail) {
  1689. - triggerPromoUpdate();
  1690. - }
  1691. -
  1692. - // AccountsChangeObserver implementation.
  1693. - @Override
  1694. - public void onAccountsChanged() {
  1695. - triggerPromoUpdate();
  1696. + return false;
  1697. }
  1698. private void triggerPromoUpdate() {
  1699. - detachPersonalizePromoView();
  1700. mPromoHeaderChangeAction.run();
  1701. }
  1702. -
  1703. - /**
  1704. - * Forces the promo state to a particular value for testing purposes.
  1705. - * @param promoState The promo state to which the header will be set to.
  1706. - */
  1707. - @VisibleForTesting
  1708. - static void forcePromoStateForTests(@Nullable @SyncPromoState Integer promoState) {
  1709. - sPromoStateForTests = promoState;
  1710. - }
  1711. }
  1712. 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
  1713. --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
  1714. +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
  1715. @@ -23,16 +23,12 @@ import org.chromium.base.metrics.RecordUserAction;
  1716. import org.chromium.chrome.R;
  1717. import org.chromium.chrome.browser.profiles.Profile;
  1718. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  1719. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1720. -import org.chromium.chrome.browser.sync.SyncService;
  1721. import org.chromium.chrome.browser.tab.TabLaunchType;
  1722. import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
  1723. import org.chromium.components.browser_ui.settings.ClickableSpansTextMessagePreference;
  1724. import org.chromium.components.embedder_support.util.UrlConstants;
  1725. import org.chromium.components.search_engines.TemplateUrl;
  1726. import org.chromium.components.search_engines.TemplateUrlService;
  1727. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  1728. -import org.chromium.components.signin.identitymanager.IdentityManager;
  1729. import org.chromium.components.sync.ModelType;
  1730. import org.chromium.ui.text.NoUnderlineClickableSpan;
  1731. import org.chromium.ui.text.SpanApplier;
  1732. @@ -89,27 +85,11 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment {
  1733. new TabDelegate(false /* incognito */)
  1734. .launchUrl(UrlConstants.MY_ACTIVITY_URL_IN_CBD, TabLaunchType.FROM_CHROME_UI);
  1735. });
  1736. -
  1737. - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
  1738. - Profile.getLastUsedRegularProfile());
  1739. - if (identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN)) {
  1740. - // Update the Clear Browsing History text based on the sign-in/sync state and whether
  1741. - // the link to MyActivity is displayed inline or at the bottom of the page.
  1742. - // Note: when sync is disabled, the default string is used.
  1743. - if (isHistorySyncEnabled()) {
  1744. - // The text is different only for users with history sync.
  1745. - historyCheckbox.setSummary(R.string.clear_browsing_history_summary_synced_no_link);
  1746. - }
  1747. - cookiesCheckbox.setSummary(
  1748. - R.string.clear_cookies_and_site_data_summary_basic_signed_in);
  1749. - }
  1750. }
  1751. @Override
  1752. public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  1753. super.onCreatePreferences(savedInstanceState, rootKey);
  1754. - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
  1755. - Profile.getLastUsedRegularProfile());
  1756. ClickableSpansTextMessagePreference googleDataTextPref =
  1757. (ClickableSpansTextMessagePreference) findPreference(
  1758. ClearBrowsingDataFragment.PREF_GOOGLE_DATA_TEXT);
  1759. @@ -120,20 +100,11 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment {
  1760. boolean isDefaultSearchEngineGoogle = templateUrlService.isDefaultSearchEngineGoogle();
  1761. // Google-related links to delete search history and other browsing activity.
  1762. - if (defaultSearchEngine == null
  1763. - || !identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN)) {
  1764. // One of two cases:
  1765. // 1. The default search engine is disabled.
  1766. // 2. The user is not signed into Chrome.
  1767. // In all those cases, delete the link to clear Google data using MyActivity.
  1768. deleteGoogleDataTextIfExists();
  1769. - } else if (isDefaultSearchEngineGoogle) {
  1770. - // Signed-in and the DSE is Google. Build the text with two links.
  1771. - googleDataTextPref.setSummary(buildGoogleSearchHistoryText());
  1772. - } else {
  1773. - // Signed-in and non-Google DSE. Build the text with the MyActivity link only.
  1774. - googleDataTextPref.setSummary(buildGoogleMyActivityText());
  1775. - }
  1776. // Text for search history if DSE is not Google.
  1777. if (defaultSearchEngine == null || isDefaultSearchEngineGoogle) {
  1778. @@ -224,9 +195,7 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment {
  1779. }
  1780. private boolean isHistorySyncEnabled() {
  1781. - SyncService syncService = SyncService.get();
  1782. - return syncService != null && syncService.isSyncRequested()
  1783. - && syncService.getActiveDataTypes().contains(ModelType.HISTORY_DELETE_DIRECTIVES);
  1784. + return false;
  1785. }
  1786. @Override
  1787. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java
  1788. --- a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java
  1789. +++ b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java
  1790. @@ -15,16 +15,8 @@ import androidx.recyclerview.widget.RecyclerView;
  1791. import org.chromium.chrome.R;
  1792. import org.chromium.chrome.browser.profiles.Profile;
  1793. -import org.chromium.chrome.browser.signin.services.DisplayableProfileData;
  1794. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  1795. -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
  1796. import org.chromium.components.browser_ui.contacts_picker.ContactDetails;
  1797. import org.chromium.components.browser_ui.contacts_picker.PickerAdapter;
  1798. -import org.chromium.components.signin.AccountManagerFacadeProvider;
  1799. -import org.chromium.components.signin.AccountUtils;
  1800. -import org.chromium.components.signin.base.CoreAccountInfo;
  1801. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  1802. -import org.chromium.components.signin.identitymanager.IdentityManager;
  1803. import java.util.ArrayList;
  1804. import java.util.Collections;
  1805. @@ -35,10 +27,7 @@ import java.util.Collections;
  1806. * Owner email is looked up in the {@link ProfileDataCache}, or, failing that, via the {@link
  1807. * AccountManagerFacade}.
  1808. */
  1809. -public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCache.Observer {
  1810. - // The profile data cache to consult when figuring out the signed in user.
  1811. - private ProfileDataCache mProfileDataCache;
  1812. -
  1813. +public class ChromePickerAdapter extends PickerAdapter {
  1814. // Whether an observer for ProfileDataCache has been registered.
  1815. private boolean mObserving;
  1816. @@ -46,8 +35,6 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
  1817. private boolean mWaitingOnOwnerInfo;
  1818. public ChromePickerAdapter(Context context) {
  1819. - mProfileDataCache =
  1820. - ProfileDataCache.createWithoutBadge(context, R.dimen.contact_picker_icon_size);
  1821. }
  1822. // Adapter:
  1823. @@ -64,38 +51,15 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
  1824. removeProfileDataObserver();
  1825. }
  1826. - // ProfileDataCache.Observer:
  1827. -
  1828. - @Override
  1829. - public void onProfileDataUpdated(String accountEmail) {
  1830. - if (!mWaitingOnOwnerInfo || !TextUtils.equals(accountEmail, getOwnerEmail())) {
  1831. - return;
  1832. - }
  1833. -
  1834. - // Now that we've received an update for the right accountId, we can stop listening and
  1835. - // update our records.
  1836. - mWaitingOnOwnerInfo = false;
  1837. - removeProfileDataObserver();
  1838. - // TODO(finnur): crbug.com/1021477 - Maintain an member instance of this.
  1839. - DisplayableProfileData profileData =
  1840. - mProfileDataCache.getProfileDataOrDefault(getOwnerEmail());
  1841. - ContactDetails contact = getAllContacts().get(0);
  1842. - Drawable icon = profileData.getImage();
  1843. - contact.setSelfIcon(icon);
  1844. - update();
  1845. - }
  1846. -
  1847. private void addProfileDataObserver() {
  1848. if (!mObserving) {
  1849. mObserving = true;
  1850. - mProfileDataCache.addObserver(this);
  1851. }
  1852. }
  1853. private void removeProfileDataObserver() {
  1854. if (mObserving) {
  1855. mObserving = false;
  1856. - mProfileDataCache.removeObserver(this);
  1857. }
  1858. }
  1859. @@ -107,13 +71,7 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
  1860. */
  1861. @Override
  1862. protected String findOwnerEmail() {
  1863. - CoreAccountInfo coreAccountInfo = getCoreAccountInfo();
  1864. - if (coreAccountInfo != null) {
  1865. - return coreAccountInfo.getEmail();
  1866. - }
  1867. - final @Nullable Account defaultAccount = AccountUtils.getDefaultAccountIfFulfilled(
  1868. - AccountManagerFacadeProvider.getInstance().getAccounts());
  1869. - return defaultAccount != null ? defaultAccount.name : null;
  1870. + return null;
  1871. }
  1872. @Override
  1873. @@ -134,25 +92,11 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
  1874. */
  1875. @SuppressLint("HardwareIds")
  1876. private ContactDetails constructOwnerInfo(String ownerEmail) {
  1877. - DisplayableProfileData profileData = mProfileDataCache.getProfileDataOrDefault(ownerEmail);
  1878. - String name = profileData.getFullNameOrEmail();
  1879. - if (TextUtils.isEmpty(name) || TextUtils.equals(name, ownerEmail)) {
  1880. - name = CoreAccountInfo.getEmailFrom(getCoreAccountInfo());
  1881. - }
  1882. + String name = "nobody@example.com";
  1883. ContactDetails contact = new ContactDetails(ContactDetails.SELF_CONTACT_ID, name,
  1884. Collections.singletonList(ownerEmail), /*phoneNumbers=*/null, /*addresses=*/null);
  1885. - Drawable icon = profileData.getImage();
  1886. contact.setIsSelf(true);
  1887. - contact.setSelfIcon(icon);
  1888. return contact;
  1889. }
  1890. -
  1891. - private CoreAccountInfo getCoreAccountInfo() {
  1892. - // Since this is read-only operation to obtain email address, always using regular profile
  1893. - // for both regular and off-the-record profile is safe.
  1894. - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
  1895. - Profile.getLastUsedRegularProfile());
  1896. - return identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC);
  1897. - }
  1898. }
  1899. 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
  1900. --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
  1901. +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
  1902. @@ -37,7 +37,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid
  1903. import org.chromium.chrome.browser.customtabs.dependency_injection.BaseCustomTabActivityComponent;
  1904. import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
  1905. import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
  1906. -import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
  1907. import org.chromium.chrome.browser.flags.AllCachedFieldTrialParameters;
  1908. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  1909. import org.chromium.chrome.browser.fonts.FontPreloader;
  1910. @@ -150,8 +149,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
  1911. @Override
  1912. public void finishNativeInitialization() {
  1913. - if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
  1914. -
  1915. mConnection.showSignInToastIfNecessary(mSession, getIntent());
  1916. new CustomTabTrustedCdnPublisherUrlVisibility(
  1917. 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
  1918. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
  1919. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
  1920. @@ -265,7 +265,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
  1921. findViewById(android.R.id.content), () -> mPages.size() > 0);
  1922. }
  1923. - mFirstRunFlowSequencer = new FirstRunFlowSequencer(this, getChildAccountStatusSupplier()) {
  1924. + mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
  1925. @Override
  1926. public void onFlowIsKnown(Bundle freProperties) {
  1927. assert freProperties != null;
  1928. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
  1929. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
  1930. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
  1931. @@ -23,7 +23,6 @@ import org.chromium.chrome.browser.init.AsyncInitializationActivity;
  1932. import org.chromium.chrome.browser.metrics.UmaUtils;
  1933. import org.chromium.chrome.browser.policy.PolicyServiceFactory;
  1934. import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
  1935. -import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
  1936. import org.chromium.components.policy.PolicyService;
  1937. import org.chromium.components.signin.AccountManagerFacade;
  1938. import org.chromium.components.signin.AccountManagerFacadeProvider;
  1939. 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
  1940. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
  1941. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
  1942. @@ -131,13 +131,11 @@ public abstract class FirstRunFlowSequencer {
  1943. public abstract void onFlowIsKnown(Bundle freProperties);
  1944. public FirstRunFlowSequencer(
  1945. - Activity activity, OneshotSupplier<Boolean> childAccountStatusSupplier) {
  1946. + Activity activity) {
  1947. mActivity = activity;
  1948. mDelegate = sDelegateForTesting != null ? sDelegateForTesting
  1949. : new FirstRunFlowSequencerDelegate();
  1950. -
  1951. - childAccountStatusSupplier.onAvailable(this::setChildAccountStatus);
  1952. }
  1953. /**
  1954. @@ -165,12 +163,6 @@ public abstract class FirstRunFlowSequencer {
  1955. return mDelegate.shouldShowSyncConsentPage(mActivity, mGoogleAccounts, mIsChild);
  1956. }
  1957. - private void setChildAccountStatus(boolean isChild) {
  1958. - assert mIsChild == null;
  1959. - mIsChild = isChild;
  1960. - maybeProcessFreEnvironmentPreNative();
  1961. - }
  1962. -
  1963. private void setAccountList(List<Account> accounts) {
  1964. assert mGoogleAccounts == null && accounts != null;
  1965. mGoogleAccounts = accounts;
  1966. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java
  1967. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java
  1968. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java
  1969. @@ -84,9 +84,4 @@ public interface FirstRunPageDelegate {
  1970. * See {@link PolicyLoadListener} for details.
  1971. */
  1972. OneshotSupplier<Boolean> getPolicyLoadListener();
  1973. -
  1974. - /**
  1975. - * Returns the supplier that supplies child account status.
  1976. - */
  1977. - OneshotSupplier<Boolean> getChildAccountStatusSupplier();
  1978. }
  1979. 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
  1980. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
  1981. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
  1982. @@ -88,7 +88,7 @@ public class LightweightFirstRunActivity
  1983. setFinishOnTouchOutside(true);
  1984. - mFirstRunFlowSequencer = new FirstRunFlowSequencer(this, getChildAccountStatusSupplier()) {
  1985. + mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
  1986. @Override
  1987. public void onFlowIsKnown(Bundle freProperties) {
  1988. if (freProperties == null) {
  1989. @@ -96,9 +96,7 @@ public class LightweightFirstRunActivity
  1990. return;
  1991. }
  1992. - boolean isChild = freProperties.getBoolean(
  1993. - SyncConsentFirstRunFragment.IS_CHILD_ACCOUNT, false);
  1994. - initializeViews(isChild);
  1995. + initializeViews(false);
  1996. }
  1997. };
  1998. mFirstRunFlowSequencer.start();
  1999. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java
  2000. --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java
  2001. +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java
  2002. @@ -125,12 +125,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupport
  2003. }
  2004. }
  2005. - @Override
  2006. - protected boolean canShowUmaCheckBox() {
  2007. - return super.canShowUmaCheckBox() && mSkipTosDialogPolicyListener.get() != null
  2008. - && !mSkipTosDialogPolicyListener.get();
  2009. - }
  2010. -
  2011. @Override
  2012. public void onShowLoadingUIComplete() {
  2013. mLoadingSpinnerContainer.setVisibility(View.VISIBLE);
  2014. 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
  2015. --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
  2016. +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
  2017. @@ -33,8 +33,6 @@ import org.chromium.chrome.browser.preferences.Pref;
  2018. import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
  2019. import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver;
  2020. import org.chromium.chrome.browser.profiles.Profile;
  2021. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2022. -import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
  2023. import org.chromium.chrome.browser.tab.Tab;
  2024. import org.chromium.chrome.browser.tab.TabLaunchType;
  2025. import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
  2026. @@ -51,7 +49,7 @@ import org.chromium.url.GURL;
  2027. /**
  2028. * Displays and manages the content view / list UI for browsing history.
  2029. */
  2030. -public class HistoryContentManager implements SignInStateObserver, PrefObserver {
  2031. +public class HistoryContentManager implements PrefObserver {
  2032. /**
  2033. * Interface for a class that wants to receive updates from this Manager.
  2034. */
  2035. @@ -207,11 +205,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
  2036. mHistoryAdapter.generateHeaderItems();
  2037. mHistoryAdapter.generateFooterItems();
  2038. - // Listen to changes in sign in state.
  2039. - IdentityServicesProvider.get()
  2040. - .getSigninManager(Profile.getLastUsedRegularProfile())
  2041. - .addSignInStateObserver(this);
  2042. -
  2043. // Create PrefChangeRegistrar to receive notifications on preference changes.
  2044. mPrefChangeRegistrar = new PrefChangeRegistrar();
  2045. mPrefChangeRegistrar.addObserver(Pref.ALLOW_DELETING_BROWSER_HISTORY, this);
  2046. @@ -245,9 +238,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
  2047. mHistoryAdapter.onDestroyed();
  2048. mLargeIconBridge.destroy();
  2049. mLargeIconBridge = null;
  2050. - IdentityServicesProvider.get()
  2051. - .getSigninManager(Profile.getLastUsedRegularProfile())
  2052. - .removeSignInStateObserver(this);
  2053. mPrefChangeRegistrar.destroy();
  2054. }
  2055. @@ -453,18 +443,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
  2056. mHistoryAdapter.removeHeader();
  2057. }
  2058. - @Override
  2059. - public void onSignedIn() {
  2060. - mObserver.onUserAccountStateChanged();
  2061. - mHistoryAdapter.onSignInStateChange();
  2062. - }
  2063. -
  2064. - @Override
  2065. - public void onSignedOut() {
  2066. - mObserver.onUserAccountStateChanged();
  2067. - mHistoryAdapter.onSignInStateChange();
  2068. - }
  2069. -
  2070. @Override
  2071. public void onPreferenceChange() {
  2072. mObserver.onUserAccountStateChanged();
  2073. @@ -511,4 +489,4 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
  2074. public static void setScrollToLoadDisabledForTesting(boolean isScrollToLoadDisabled) {
  2075. sIsScrollToLoadDisabledForTests = isScrollToLoadDisabled;
  2076. }
  2077. -}
  2078. \ No newline at end of file
  2079. +}
  2080. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
  2081. --- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
  2082. +++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
  2083. @@ -22,8 +22,6 @@ import org.chromium.chrome.browser.ntp.NewTabPage;
  2084. import org.chromium.chrome.browser.profiles.Profile;
  2085. import org.chromium.chrome.browser.settings.MainSettings;
  2086. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  2087. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2088. -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
  2089. import org.chromium.chrome.browser.tab.Tab;
  2090. import org.chromium.chrome.browser.toolbar.ButtonData;
  2091. import org.chromium.chrome.browser.toolbar.ButtonData.ButtonSpec;
  2092. @@ -35,10 +33,6 @@ import org.chromium.components.browser_ui.settings.SettingsLauncher;
  2093. import org.chromium.components.feature_engagement.EventConstants;
  2094. import org.chromium.components.feature_engagement.FeatureConstants;
  2095. import org.chromium.components.feature_engagement.Tracker;
  2096. -import org.chromium.components.signin.base.CoreAccountInfo;
  2097. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  2098. -import org.chromium.components.signin.identitymanager.IdentityManager;
  2099. -import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
  2100. import java.lang.annotation.Retention;
  2101. import java.lang.annotation.RetentionPolicy;
  2102. @@ -47,8 +41,8 @@ import java.lang.annotation.RetentionPolicy;
  2103. * Handles displaying IdentityDisc on toolbar depending on several conditions
  2104. * (user sign-in state, whether NTP is shown)
  2105. */
  2106. -public class IdentityDiscController implements NativeInitObserver, ProfileDataCache.Observer,
  2107. - IdentityManager.Observer, ButtonDataProvider {
  2108. +public class IdentityDiscController implements NativeInitObserver,
  2109. + ButtonDataProvider {
  2110. // Visual state of Identity Disc.
  2111. @Retention(RetentionPolicy.SOURCE)
  2112. @IntDef({IdentityDiscState.NONE, IdentityDiscState.SMALL, IdentityDiscState.LARGE})
  2113. @@ -70,15 +64,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
  2114. private final ObservableSupplier<Profile> mProfileSupplier;
  2115. private final Callback<Profile> mProfileSupplierObserver = this::setProfile;
  2116. - // We observe IdentityManager to receive primary account state change notifications.
  2117. - private IdentityManager mIdentityManager;
  2118. -
  2119. - // ProfileDataCache facilitates retrieving profile picture. Separate objects are maintained
  2120. - // for different visual states to cache profile pictures of different size.
  2121. - // mProfileDataCache[IdentityDiscState.NONE] should always be null since in this state
  2122. - // Identity Disc is not visible.
  2123. - private ProfileDataCache mProfileDataCache[] = new ProfileDataCache[IdentityDiscState.MAX];
  2124. -
  2125. // Identity disc visibility state.
  2126. @IdentityDiscState
  2127. private int mState = IdentityDiscState.NONE;
  2128. @@ -165,18 +150,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
  2129. assert !mButtonData.canShow();
  2130. return;
  2131. }
  2132. -
  2133. - String email = CoreAccountInfo.getEmailFrom(getSignedInAccountInfo());
  2134. - mState = email == null ? IdentityDiscState.NONE : IdentityDiscState.SMALL;
  2135. - ensureProfileDataCache(email, mState);
  2136. -
  2137. - if (mState != IdentityDiscState.NONE) {
  2138. - mButtonData.setButtonSpec(
  2139. - buttonSpecWithDrawable(mButtonData.getButtonSpec(), getProfileImage(email)));
  2140. - mButtonData.setCanShow(true);
  2141. - } else {
  2142. - mButtonData.setCanShow(false);
  2143. - }
  2144. }
  2145. private static ButtonSpec buttonSpecWithDrawable(ButtonSpec buttonSpec, Drawable drawable) {
  2146. @@ -191,24 +164,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
  2147. * IdentityDiscController for profile data updates.
  2148. */
  2149. private void ensureProfileDataCache(String accountName, @IdentityDiscState int state) {
  2150. - if (state == IdentityDiscState.NONE || mProfileDataCache[state] != null) return;
  2151. -
  2152. - @DimenRes
  2153. - int dimension_id =
  2154. - (state == IdentityDiscState.SMALL) ? R.dimen.toolbar_identity_disc_size
  2155. - : R.dimen.toolbar_identity_disc_size_duet;
  2156. - ProfileDataCache profileDataCache =
  2157. - ProfileDataCache.createWithoutBadge(mContext, dimension_id);
  2158. - profileDataCache.addObserver(this);
  2159. - mProfileDataCache[state] = profileDataCache;
  2160. - }
  2161. -
  2162. - /**
  2163. - * Returns Profile picture Drawable. The size of the image corresponds to current visual state.
  2164. - */
  2165. - private Drawable getProfileImage(String accountName) {
  2166. - assert mState != IdentityDiscState.NONE;
  2167. - return mProfileDataCache[mState].getProfileDataOrDefault(accountName).getImage();
  2168. }
  2169. /**
  2170. @@ -216,13 +171,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
  2171. * when sign-in state changes.
  2172. */
  2173. private void resetIdentityDiscCache() {
  2174. - for (int i = 0; i < IdentityDiscState.MAX; i++) {
  2175. - if (mProfileDataCache[i] != null) {
  2176. - assert i != IdentityDiscState.NONE;
  2177. - mProfileDataCache[i].removeObserver(this);
  2178. - mProfileDataCache[i] = null;
  2179. - }
  2180. - }
  2181. }
  2182. private void notifyObservers(boolean hint) {
  2183. @@ -231,47 +179,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
  2184. }
  2185. }
  2186. - /**
  2187. - * Called after profile image becomes available. Updates the image on toolbar button.
  2188. - */
  2189. - @Override
  2190. - public void onProfileDataUpdated(String accountEmail) {
  2191. - if (mState == IdentityDiscState.NONE) return;
  2192. - assert mProfileDataCache[mState] != null;
  2193. -
  2194. - if (accountEmail.equals(CoreAccountInfo.getEmailFrom(getSignedInAccountInfo()))) {
  2195. - /**
  2196. - * We need to call {@link notifyObservers(false)} before caling
  2197. - * {@link notifyObservers(true)}. This is because {@link notifyObservers(true)} has been
  2198. - * called in {@link setProfile()}, and without calling {@link notifyObservers(false)},
  2199. - * the ObservableSupplierImpl doesn't propagate the call. See https://cubug.com/1137535.
  2200. - */
  2201. - notifyObservers(false);
  2202. - notifyObservers(true);
  2203. - }
  2204. - }
  2205. -
  2206. - /**
  2207. - * Implements {@link IdentityManager.Observer}.
  2208. - *
  2209. - * IdentityDisc should be shown as long as the user is signed in. Whether the user is syncing
  2210. - * or not should not matter.
  2211. - */
  2212. - @Override
  2213. - public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
  2214. - switch (eventDetails.getEventTypeFor(ConsentLevel.SIGNIN)) {
  2215. - case PrimaryAccountChangeEvent.Type.SET:
  2216. - resetIdentityDiscCache();
  2217. - notifyObservers(true);
  2218. - break;
  2219. - case PrimaryAccountChangeEvent.Type.CLEARED:
  2220. - notifyObservers(false);
  2221. - break;
  2222. - case PrimaryAccountChangeEvent.Type.NONE:
  2223. - break;
  2224. - }
  2225. - }
  2226. -
  2227. /**
  2228. * Call to tear down dependencies.
  2229. */
  2230. @@ -282,18 +189,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
  2231. mActivityLifecycleDispatcher = null;
  2232. }
  2233. - for (int i = 0; i < IdentityDiscState.MAX; i++) {
  2234. - if (mProfileDataCache[i] != null) {
  2235. - mProfileDataCache[i].removeObserver(this);
  2236. - mProfileDataCache[i] = null;
  2237. - }
  2238. - }
  2239. -
  2240. - if (mIdentityManager != null) {
  2241. - mIdentityManager.removeObserver(this);
  2242. - mIdentityManager = null;
  2243. - }
  2244. -
  2245. if (mNativeIsInitialized) {
  2246. mProfileSupplier.removeObserver(mProfileSupplierObserver);
  2247. }
  2248. @@ -310,32 +205,10 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
  2249. RecordUserAction.record("MobileToolbarIdentityDiscTap");
  2250. }
  2251. - /**
  2252. - * Returns the account info of mIdentityManager if current profile is regular, and
  2253. - * null for off-the-record ones.
  2254. - * @return account info for the current profile. Returns null for OTR profile.
  2255. - */
  2256. - private CoreAccountInfo getSignedInAccountInfo() {
  2257. - return mIdentityManager != null
  2258. - ? mIdentityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN)
  2259. - : null;
  2260. - }
  2261. -
  2262. /**
  2263. * Triggered by mProfileSupplierObserver when profile is changed in mProfileSupplier.
  2264. * mIdentityManager is updated with the profile, as set to null if profile is off-the-record.
  2265. */
  2266. private void setProfile(Profile profile) {
  2267. - if (mIdentityManager != null) {
  2268. - mIdentityManager.removeObserver(this);
  2269. - }
  2270. -
  2271. - if (profile.isOffTheRecord()) {
  2272. - mIdentityManager = null;
  2273. - } else {
  2274. - mIdentityManager = IdentityServicesProvider.get().getIdentityManager(profile);
  2275. - mIdentityManager.addObserver(this);
  2276. - notifyObservers(true);
  2277. - }
  2278. }
  2279. }
  2280. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java
  2281. --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java
  2282. +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java
  2283. @@ -12,29 +12,26 @@ import org.chromium.components.infobars.ConfirmInfoBar;
  2284. import org.chromium.components.infobars.InfoBar;
  2285. import org.chromium.components.infobars.InfoBarControlLayout;
  2286. import org.chromium.components.infobars.InfoBarLayout;
  2287. -import org.chromium.components.signin.base.AccountInfo;
  2288. /**
  2289. * The Save Password infobar asks the user whether they want to save the password for the site.
  2290. */
  2291. public class SavePasswordInfoBar extends ConfirmInfoBar {
  2292. private final String mDetailsMessage;
  2293. - private final AccountInfo mAccountInfo;
  2294. @CalledByNative
  2295. private static InfoBar show(int iconId, String message, String detailsMessage,
  2296. - String primaryButtonText, String secondaryButtonText, AccountInfo accountInfo) {
  2297. + String primaryButtonText, String secondaryButtonText) {
  2298. // If accountInfo is empty, no footer will be shown.
  2299. return new SavePasswordInfoBar(iconId, message, detailsMessage, primaryButtonText,
  2300. - secondaryButtonText, accountInfo);
  2301. + secondaryButtonText);
  2302. }
  2303. private SavePasswordInfoBar(int iconDrawbleId, String message, String detailsMessage,
  2304. - String primaryButtonText, String secondaryButtonText, AccountInfo accountInfo) {
  2305. + String primaryButtonText, String secondaryButtonText) {
  2306. super(iconDrawbleId, R.color.infobar_icon_drawable_color, null, message, null,
  2307. primaryButtonText, secondaryButtonText);
  2308. mDetailsMessage = detailsMessage;
  2309. - mAccountInfo = accountInfo;
  2310. }
  2311. @Override
  2312. @@ -44,11 +41,5 @@ public class SavePasswordInfoBar extends ConfirmInfoBar {
  2313. InfoBarControlLayout detailsMessageLayout = layout.addControlLayout();
  2314. detailsMessageLayout.addDescription(mDetailsMessage);
  2315. }
  2316. -
  2317. - if (mAccountInfo != null && !TextUtils.isEmpty(mAccountInfo.getEmail())
  2318. - && mAccountInfo.getAccountImage() != null) {
  2319. - layout.addFooterView(PasswordInfoBarUtils.createAccountIndicationFooter(
  2320. - layout.getContext(), mAccountInfo.getAccountImage(), mAccountInfo.getEmail()));
  2321. - }
  2322. }
  2323. }
  2324. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java
  2325. --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java
  2326. +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java
  2327. @@ -14,7 +14,6 @@ import org.chromium.components.infobars.InfoBar;
  2328. import org.chromium.components.infobars.InfoBarControlLayout;
  2329. import org.chromium.components.infobars.InfoBarControlLayout.InfoBarArrayAdapter;
  2330. import org.chromium.components.infobars.InfoBarLayout;
  2331. -import org.chromium.components.signin.base.AccountInfo;
  2332. /**
  2333. * The Update Password infobar offers the user the ability to update a password for the site.
  2334. @@ -23,27 +22,23 @@ public class UpdatePasswordInfoBar extends ConfirmInfoBar {
  2335. private final String[] mUsernames;
  2336. private final int mUsernameIndex;
  2337. private final String mDetailsMessage;
  2338. - private final AccountInfo mAccountInfo;
  2339. private Spinner mUsernamesSpinner;
  2340. @CalledByNative
  2341. private static InfoBar show(int iconId, String[] usernames, int selectedUsername,
  2342. - String message, String detailsMessage, String primaryButtonText,
  2343. - AccountInfo accountInfo) {
  2344. + String message, String detailsMessage, String primaryButtonText) {
  2345. // If accountInfo is empty, no footer will be shown.
  2346. return new UpdatePasswordInfoBar(iconId, usernames, selectedUsername, message,
  2347. - detailsMessage, primaryButtonText, accountInfo);
  2348. + detailsMessage, primaryButtonText);
  2349. }
  2350. private UpdatePasswordInfoBar(int iconDrawableId, String[] usernames, int selectedUsername,
  2351. - String message, String detailsMessage, String primaryButtonText,
  2352. - AccountInfo accountInfo) {
  2353. + String message, String detailsMessage, String primaryButtonText) {
  2354. super(iconDrawableId, R.color.infobar_icon_drawable_color, null, message, null,
  2355. primaryButtonText, null);
  2356. mDetailsMessage = detailsMessage;
  2357. mUsernames = usernames;
  2358. mUsernameIndex = selectedUsername;
  2359. - mAccountInfo = accountInfo;
  2360. }
  2361. @Override
  2362. @@ -65,12 +60,6 @@ public class UpdatePasswordInfoBar extends ConfirmInfoBar {
  2363. InfoBarControlLayout detailsMessageLayout = layout.addControlLayout();
  2364. detailsMessageLayout.addDescription(mDetailsMessage);
  2365. }
  2366. -
  2367. - if (mAccountInfo != null && !TextUtils.isEmpty(mAccountInfo.getEmail())
  2368. - && mAccountInfo.getAccountImage() != null) {
  2369. - layout.addFooterView(PasswordInfoBarUtils.createAccountIndicationFooter(
  2370. - layout.getContext(), mAccountInfo.getAccountImage(), mAccountInfo.getEmail()));
  2371. - }
  2372. }
  2373. @CalledByNative
  2374. 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
  2375. --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
  2376. +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
  2377. @@ -37,7 +37,6 @@ import org.chromium.chrome.browser.download.DownloadManagerService;
  2378. import org.chromium.chrome.browser.flags.ChromeSwitches;
  2379. import org.chromium.chrome.browser.language.GlobalAppLocaleController;
  2380. import org.chromium.chrome.browser.metrics.UmaUtils;
  2381. -import org.chromium.chrome.browser.signin.SigninCheckerProvider;
  2382. import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
  2383. import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
  2384. import org.chromium.components.crash.browser.ChildProcessCrashObserver;
  2385. @@ -360,7 +359,6 @@ public class ChromeBrowserInitializer {
  2386. LibraryPrefetcher.asyncPrefetchLibrariesToMemory();
  2387. getBrowserStartupController().startBrowserProcessesSync(
  2388. LibraryProcessType.PROCESS_BROWSER, /*singleProcess=*/false);
  2389. - SigninCheckerProvider.get();
  2390. } finally {
  2391. TraceEvent.end("ChromeBrowserInitializer.startChromeBrowserProcessesSync");
  2392. }
  2393. 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
  2394. --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
  2395. +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
  2396. @@ -82,7 +82,6 @@ import org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidg
  2397. import org.chromium.chrome.browser.rlz.RevenueStats;
  2398. import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
  2399. import org.chromium.chrome.browser.sharing.shared_clipboard.SharedClipboardShareActivity;
  2400. -import org.chromium.chrome.browser.signin.SigninCheckerProvider;
  2401. import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData;
  2402. import org.chromium.chrome.browser.tasks.tab_management.PriceTrackingUtilities;
  2403. import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager;
  2404. @@ -196,11 +195,6 @@ public class ProcessInitializationHandler {
  2405. Context application = ContextUtils.getApplicationContext();
  2406. - // Initialize the AccountManagerFacade with the correct AccountManagerDelegate. Must be done
  2407. - // only once and before AccountManagerFacadeProvider.getInstance() is invoked.
  2408. - AccountManagerFacadeProvider.setInstance(
  2409. - new AccountManagerFacadeImpl(AppHooks.get().createAccountManagerDelegate()));
  2410. -
  2411. // For ANR uploading - we set the version number so that when we ask Android for our ANRs,
  2412. // it can also give us the version it happened on. This helps in the case that before we can
  2413. // report the ANR, our app gets updated.
  2414. @@ -398,7 +392,6 @@ public class ProcessInitializationHandler {
  2415. deferredStartupHandler.addDeferredTask(new Runnable() {
  2416. @Override
  2417. public void run() {
  2418. - SigninCheckerProvider.get().onMainActivityStart();
  2419. RevenueStats.getInstance();
  2420. }
  2421. });
  2422. 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
  2423. --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
  2424. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
  2425. @@ -15,22 +15,12 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager;
  2426. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
  2427. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
  2428. import org.chromium.chrome.browser.profiles.Profile;
  2429. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  2430. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2431. -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
  2432. -import org.chromium.chrome.browser.signin.services.SigninManager;
  2433. -import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
  2434. -import org.chromium.chrome.browser.sync.SyncService;
  2435. import org.chromium.chrome.browser.tab.Tab;
  2436. import org.chromium.chrome.browser.tabmodel.TabModel;
  2437. import org.chromium.chrome.browser.tabmodel.TabModelSelector;
  2438. import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
  2439. import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
  2440. -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
  2441. -import org.chromium.chrome.browser.ui.signin.SigninPromoController;
  2442. -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
  2443. import org.chromium.components.signin.AccountManagerFacadeProvider;
  2444. -import org.chromium.components.signin.AccountsChangeObserver;
  2445. import org.chromium.components.signin.identitymanager.ConsentLevel;
  2446. import org.chromium.components.signin.metrics.SigninAccessPoint;
  2447. import org.chromium.url.GURL;
  2448. @@ -42,8 +32,7 @@ import java.util.Map;
  2449. /**
  2450. * Provides the domain logic and data for RecentTabsPage and RecentTabsRowAdapter.
  2451. */
  2452. -public class RecentTabsManager implements SyncService.SyncStateChangedListener, SignInStateObserver,
  2453. - ProfileDataCache.Observer, AccountsChangeObserver {
  2454. +public class RecentTabsManager {
  2455. /**
  2456. * Implement this to receive updates when the page contents change.
  2457. */
  2458. @@ -64,21 +53,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  2459. private final Runnable mShowHistoryManager;
  2460. private TabModel mTabModel;
  2461. - private @SyncPromoState int mPromoState = SyncPromoState.NO_PROMO;
  2462. private FaviconHelper mFaviconHelper;
  2463. private ForeignSessionHelper mForeignSessionHelper;
  2464. private List<ForeignSession> mForeignSessions;
  2465. private List<RecentlyClosedEntry> mRecentlyClosedEntries;
  2466. private RecentTabsPagePrefs mPrefs;
  2467. private RecentlyClosedTabManager mRecentlyClosedTabManager;
  2468. - private SigninManager mSignInManager;
  2469. private UpdatedCallback mUpdatedCallback;
  2470. private boolean mIsDestroyed;
  2471. - private final ProfileDataCache mProfileDataCache;
  2472. - private final SigninPromoController mSigninPromoController;
  2473. - private final SyncService mSyncService;
  2474. -
  2475. /**
  2476. * Maps Session IDs to whether that entry was restored split by entry type. These are used to
  2477. * record historgrams on {@link #destroy()} to measure restore ratio. Cached Session IDs are
  2478. @@ -110,12 +93,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  2479. mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null
  2480. ? sRecentlyClosedTabManagerForTests
  2481. : new RecentlyClosedBridge(profile, tabModelSelector);
  2482. - mSignInManager = IdentityServicesProvider.get().getSigninManager(mProfile);
  2483. -
  2484. - mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(context);
  2485. - mSigninPromoController = new SigninPromoController(
  2486. - SigninAccessPoint.RECENT_TABS, SyncConsentActivityLauncherImpl.get());
  2487. - mSyncService = SyncService.get();
  2488. mRecentlyClosedTabManager.setEntriesUpdatedRunnable(this::updateRecentlyClosedEntries);
  2489. updateRecentlyClosedEntries();
  2490. @@ -124,12 +101,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  2491. updateForeignSessions();
  2492. mForeignSessionHelper.triggerSessionSync();
  2493. - mSyncService.addSyncStateChangedListener(this);
  2494. - mSignInManager.addSignInStateObserver(this);
  2495. - mProfileDataCache.addObserver(this);
  2496. - AccountManagerFacadeProvider.getInstance().addObserver(this);
  2497. - updatePromoState();
  2498. -
  2499. SessionsInvalidationManager.get(mProfile).onRecentTabsPageOpened();
  2500. }
  2501. @@ -167,14 +138,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  2502. recordEntries("Group", mGroupSessionIdsRestored);
  2503. recordEntries("Bulk", mBulkSessionIdsRestored);
  2504. - mSyncService.removeSyncStateChangedListener(this);
  2505. -
  2506. - mSignInManager.removeSignInStateObserver(this);
  2507. - mSignInManager = null;
  2508. -
  2509. - mProfileDataCache.removeObserver(this);
  2510. - AccountManagerFacadeProvider.getInstance().removeObserver(this);
  2511. -
  2512. mFaviconHelper.destroy();
  2513. mFaviconHelper = null;
  2514. @@ -419,80 +382,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  2515. return mPrefs.getSyncPromoCollapsed();
  2516. }
  2517. - /** Returns the current promo state. */
  2518. - @SyncPromoState
  2519. - int getPromoState() {
  2520. - return mPromoState;
  2521. - }
  2522. -
  2523. - private @SyncPromoState int calculatePromoState() {
  2524. - if (!mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC)) {
  2525. - if (!mSignInManager.isSyncOptInAllowed()) {
  2526. - return SyncPromoState.NO_PROMO;
  2527. - }
  2528. - if (mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SIGNIN)) {
  2529. - return SyncPromoState.PROMO_FOR_SIGNED_IN_STATE;
  2530. - }
  2531. - return SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE;
  2532. - }
  2533. -
  2534. - if (mSyncService.isSyncRequested() && !mForeignSessions.isEmpty()) {
  2535. - return SyncPromoState.NO_PROMO;
  2536. - }
  2537. - return SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE;
  2538. - }
  2539. -
  2540. - private void updatePromoState() {
  2541. - final @SyncPromoState int newState = calculatePromoState();
  2542. - if (newState == mPromoState) return;
  2543. -
  2544. - final boolean hasSyncPromoStateChangedtoShown =
  2545. - (mPromoState == SyncPromoState.NO_PROMO
  2546. - || mPromoState == SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE)
  2547. - && (newState == SyncPromoState.PROMO_FOR_SIGNED_IN_STATE
  2548. - || newState == SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE);
  2549. - if (hasSyncPromoStateChangedtoShown) {
  2550. - mSigninPromoController.increasePromoShowCount();
  2551. - }
  2552. - mPromoState = newState;
  2553. - }
  2554. -
  2555. - /**
  2556. - * Sets up the sync promo view.
  2557. - */
  2558. - void setUpSyncPromoView(PersonalizedSigninPromoView view) {
  2559. - mSigninPromoController.setUpSyncPromoView(mProfileDataCache, view, null);
  2560. - }
  2561. -
  2562. - // SignInStateObserver implementation.
  2563. - @Override
  2564. - public void onSignedIn() {
  2565. - update();
  2566. - }
  2567. -
  2568. - @Override
  2569. - public void onSignedOut() {
  2570. - update();
  2571. - }
  2572. -
  2573. - // AccountsChangeObserver implementation.
  2574. - @Override
  2575. - public void onAccountsChanged() {
  2576. - update();
  2577. - }
  2578. -
  2579. - // ProfileDataCache.Observer implementation.
  2580. - @Override
  2581. - public void onProfileDataUpdated(String accountEmail) {
  2582. - update();
  2583. - }
  2584. -
  2585. - // SyncService.SyncStateChangedListener implementation.
  2586. - @Override
  2587. - public void syncStateChanged() {
  2588. - update();
  2589. - }
  2590. -
  2591. private void onUpdateDone() {
  2592. if (mUpdatedCallback != null) {
  2593. mUpdatedCallback.onUpdated();
  2594. @@ -500,7 +389,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
  2595. }
  2596. private void update() {
  2597. - updatePromoState();
  2598. if (mIsDestroyed) return;
  2599. updateForeignSessions();
  2600. onUpdateDone();
  2601. 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
  2602. --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
  2603. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
  2604. @@ -31,15 +31,12 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  2605. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
  2606. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
  2607. import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionWindow;
  2608. -import org.chromium.chrome.browser.signin.SyncPromoView;
  2609. import org.chromium.chrome.browser.ui.favicon.FaviconHelper.DefaultFaviconHelper;
  2610. import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
  2611. import org.chromium.chrome.browser.ui.favicon.FaviconUtils;
  2612. -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
  2613. import org.chromium.components.browser_ui.styles.SemanticColorUtils;
  2614. import org.chromium.components.browser_ui.widget.RoundedIconGenerator;
  2615. import org.chromium.components.embedder_support.util.UrlUtilities;
  2616. -import org.chromium.components.signin.metrics.SigninAccessPoint;
  2617. import org.chromium.ui.base.DeviceFormFactor;
  2618. import org.chromium.ui.mojom.WindowOpenDisposition;
  2619. import org.chromium.url.GURL;
  2620. @@ -432,38 +429,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
  2621. }
  2622. }
  2623. - /** A group containing the personalized sync promo. */
  2624. - class PersonalizedSyncPromoGroup extends PromoGroup {
  2625. - private final @ChildType int mChildType;
  2626. -
  2627. - PersonalizedSyncPromoGroup(@ChildType int childType) {
  2628. - assert childType == ChildType.PERSONALIZED_SIGNIN_PROMO
  2629. - || childType
  2630. - == ChildType.PERSONALIZED_SYNC_PROMO : "Unsupported child type:"
  2631. - + childType;
  2632. - mChildType = childType;
  2633. - }
  2634. -
  2635. - @Override
  2636. - @ChildType
  2637. - int getChildType() {
  2638. - return mChildType;
  2639. - }
  2640. -
  2641. - @Override
  2642. - View getChildView(
  2643. - int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
  2644. - if (convertView == null) {
  2645. - LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
  2646. - convertView = layoutInflater.inflate(
  2647. - R.layout.personalized_signin_promo_view_recent_tabs, parent, false);
  2648. - }
  2649. - mRecentTabsManager.setUpSyncPromoView(
  2650. - convertView.findViewById(R.id.signin_promo_view_container));
  2651. - return convertView;
  2652. - }
  2653. - }
  2654. -
  2655. /**
  2656. * A group containing the sync promo.
  2657. */
  2658. @@ -476,9 +441,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
  2659. @Override
  2660. View getChildView(
  2661. int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
  2662. - if (convertView == null) {
  2663. - convertView = SyncPromoView.create(parent, SigninAccessPoint.RECENT_TABS);
  2664. - }
  2665. return convertView;
  2666. }
  2667. }
  2668. @@ -904,22 +866,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
  2669. addGroup(new ForeignSessionGroup(session));
  2670. }
  2671. - switch (mRecentTabsManager.getPromoState()) {
  2672. - case SyncPromoState.NO_PROMO:
  2673. - break;
  2674. - case SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE:
  2675. - addGroup(new PersonalizedSyncPromoGroup(ChildType.PERSONALIZED_SIGNIN_PROMO));
  2676. - break;
  2677. - case SyncPromoState.PROMO_FOR_SIGNED_IN_STATE:
  2678. - addGroup(new PersonalizedSyncPromoGroup(ChildType.PERSONALIZED_SYNC_PROMO));
  2679. - break;
  2680. - case SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE:
  2681. - addGroup(new SyncPromoGroup());
  2682. - break;
  2683. - default:
  2684. - assert false : "Unexpected value for promo type!";
  2685. - }
  2686. -
  2687. // Add separator line after the recently closed tabs group.
  2688. int recentlyClosedIndex = mGroups.indexOf(mRecentlyClosedTabsGroup);
  2689. if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
  2690. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
  2691. --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
  2692. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
  2693. @@ -25,7 +25,6 @@ import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
  2694. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  2695. import org.chromium.chrome.browser.profiles.Profile;
  2696. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  2697. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2698. import org.chromium.chrome.browser.ui.theme.BrandedColorScheme;
  2699. import org.chromium.components.externalauth.ExternalAuthUtils;
  2700. import org.chromium.components.signin.AccountManagerFacadeProvider;
  2701. 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
  2702. --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
  2703. +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
  2704. @@ -40,9 +40,6 @@ public abstract class RequestGenerator {
  2705. protected RequestGenerator(Context context) {
  2706. mApplicationContext = context.getApplicationContext();
  2707. - UniqueIdentificationGeneratorFactory.registerGenerator(
  2708. - SettingsSecureBasedIdentificationGenerator.GENERATOR_ID,
  2709. - new SettingsSecureBasedIdentificationGenerator(getContext()), false);
  2710. }
  2711. /**
  2712. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java
  2713. --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java
  2714. +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java
  2715. @@ -128,7 +128,7 @@ public class AccountChooserDialog
  2716. Drawable avatar = credential.getAvatar();
  2717. if (avatar == null) {
  2718. avatar = AppCompatResources.getDrawable(
  2719. - getContext(), R.drawable.logo_avatar_anonymous);
  2720. + getContext(), R.drawable.omnibox_info);
  2721. }
  2722. avatarView.setImageDrawable(avatar);
  2723. 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
  2724. --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
  2725. +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
  2726. @@ -11,7 +11,6 @@ import org.chromium.base.supplier.ObservableSupplier;
  2727. import org.chromium.base.supplier.ObservableSupplierImpl;
  2728. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  2729. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  2730. -import org.chromium.chrome.browser.sync.SyncService;
  2731. import org.chromium.content_public.browser.WebContents;
  2732. import org.chromium.ui.base.WindowAndroid;
  2733. import org.chromium.ui.modaldialog.ModalDialogManager;
  2734. @@ -32,20 +31,8 @@ public class PasswordManagerLauncher {
  2735. public static void showPasswordSettings(Activity activity,
  2736. @ManagePasswordsReferrer int referrer,
  2737. ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
  2738. - SyncService syncService = SyncService.get();
  2739. - if (syncService.isEngineInitialized()
  2740. - && PasswordManagerHelper.hasChosenToSyncPasswordsWithNoCustomPassphrase(syncService)
  2741. - && (ChromeFeatureList.isEnabled(ChromeFeatureList.PASSWORD_SCRIPTS_FETCHING)
  2742. - || ChromeFeatureList.isEnabled(
  2743. - ChromeFeatureList.PASSWORD_DOMAIN_CAPABILITIES_FETCHING))) {
  2744. - PasswordScriptsFetcherBridge.prewarmCache();
  2745. - }
  2746. - CredentialManagerLauncher credentialManagerLauncher =
  2747. - PasswordManagerHelper.usesUnifiedPasswordManagerUI()
  2748. - ? CredentialManagerLauncherFactory.getInstance().createLauncher()
  2749. - : null;
  2750. PasswordManagerHelper.showPasswordSettings(activity, referrer, new SettingsLauncherImpl(),
  2751. - credentialManagerLauncher, syncService, modalDialogManagerSupplier);
  2752. + null, modalDialogManagerSupplier);
  2753. }
  2754. @CalledByNative
  2755. 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
  2756. --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
  2757. +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
  2758. @@ -40,8 +40,6 @@ import org.chromium.chrome.browser.preferences.Pref;
  2759. import org.chromium.chrome.browser.profiles.Profile;
  2760. import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
  2761. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  2762. -import org.chromium.chrome.browser.sync.SyncService;
  2763. -import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
  2764. import org.chromium.components.browser_ui.settings.ChromeBasePreference;
  2765. import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  2766. import org.chromium.components.browser_ui.settings.SearchUtils;
  2767. @@ -68,7 +66,7 @@ import org.chromium.chrome.browser.ApplicationLifetime;
  2768. */
  2769. public class PasswordSettings extends PreferenceFragmentCompat
  2770. implements PasswordManagerHandler.PasswordListObserver,
  2771. - Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener,
  2772. + Preference.OnPreferenceClickListener,
  2773. INeedSnackbarManager {
  2774. @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN,
  2775. TrustedVaultBannerState.OPTED_IN})
  2776. @@ -176,10 +174,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
  2777. setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getStyledContext()));
  2778. PasswordManagerHandlerProvider.getInstance().addObserver(this);
  2779. - if (SyncService.get() != null) {
  2780. - SyncService.get().addSyncStateChangedListener(this);
  2781. - }
  2782. -
  2783. setHasOptionsMenu(true); // Password Export might be optional but Search is always present.
  2784. mManagePasswordsReferrer = getReferrerFromInstanceStateOrLaunchBundle(savedInstanceState);
  2785. @@ -487,9 +481,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
  2786. public void onDestroy() {
  2787. super.onDestroy();
  2788. - if (SyncService.get() != null) {
  2789. - SyncService.get().removeSyncStateChangedListener(this);
  2790. - }
  2791. // The component should only be destroyed when the activity has been closed by the user
  2792. // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed
  2793. // by the system.
  2794. @@ -667,34 +658,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
  2795. }
  2796. private void displayManageAccountLink() {
  2797. - SyncService syncService = SyncService.get();
  2798. - if (syncService == null || !syncService.isEngineInitialized()) {
  2799. - return;
  2800. - }
  2801. - if (!PasswordManagerHelper.isSyncingPasswordsWithNoCustomPassphrase(SyncService.get())) {
  2802. - return;
  2803. - }
  2804. - if (mSearchQuery != null && !mNoPasswords) {
  2805. - return; // Don't add the Manage Account link if there is a search going on.
  2806. - }
  2807. - if (getPreferenceScreen().findPreference(PREF_KEY_MANAGE_ACCOUNT_LINK) != null) {
  2808. - return; // Don't add the Manage Account link if it's present.
  2809. - }
  2810. - if (mLinkPref != null) {
  2811. - // If we created the link before, reuse it.
  2812. - getPreferenceScreen().addPreference(mLinkPref);
  2813. - return;
  2814. - }
  2815. - ForegroundColorSpan colorSpan =
  2816. - new ForegroundColorSpan(SemanticColorUtils.getDefaultTextColorLink(getContext()));
  2817. - SpannableString title = SpanApplier.applySpans(getString(R.string.manage_passwords_text),
  2818. - new SpanApplier.SpanInfo("<link>", "</link>", colorSpan));
  2819. - mLinkPref = new ChromeBasePreference(getStyledContext());
  2820. - mLinkPref.setKey(PREF_KEY_MANAGE_ACCOUNT_LINK);
  2821. - mLinkPref.setTitle(title);
  2822. - mLinkPref.setOnPreferenceClickListener(this);
  2823. - mLinkPref.setOrder(ORDER_MANAGE_ACCOUNT_LINK);
  2824. - getPreferenceScreen().addPreference(mLinkPref);
  2825. }
  2826. private Context getStyledContext() {
  2827. @@ -705,43 +668,11 @@ public class PasswordSettings extends PreferenceFragmentCompat
  2828. return UserPrefs.get(Profile.getLastUsedRegularProfile());
  2829. }
  2830. - @Override
  2831. - public void syncStateChanged() {
  2832. - final @TrustedVaultBannerState int oldTrustedVaultBannerState = mTrustedVaultBannerState;
  2833. - computeTrustedVaultBannerState();
  2834. - if (oldTrustedVaultBannerState != mTrustedVaultBannerState) {
  2835. - rebuildPasswordLists();
  2836. - }
  2837. - }
  2838. -
  2839. private void computeTrustedVaultBannerState() {
  2840. - final SyncService syncService = SyncService.get();
  2841. - if (syncService == null) {
  2842. - mTrustedVaultBannerState = TrustedVaultBannerState.NOT_SHOWN;
  2843. - return;
  2844. - }
  2845. - if (!syncService.isEngineInitialized()) {
  2846. - // Can't call getPassphraseType() yet.
  2847. mTrustedVaultBannerState = TrustedVaultBannerState.NOT_SHOWN;
  2848. - return;
  2849. - }
  2850. - if (syncService.getPassphraseType() == PassphraseType.TRUSTED_VAULT_PASSPHRASE) {
  2851. - mTrustedVaultBannerState = TrustedVaultBannerState.OPTED_IN;
  2852. - return;
  2853. - }
  2854. - if (syncService.shouldOfferTrustedVaultOptIn()) {
  2855. - mTrustedVaultBannerState = TrustedVaultBannerState.OFFER_OPT_IN;
  2856. - return;
  2857. - }
  2858. - mTrustedVaultBannerState = TrustedVaultBannerState.NOT_SHOWN;
  2859. }
  2860. private boolean openTrustedVaultOptInDialog(Preference unused) {
  2861. - assert SyncService.get() != null;
  2862. - CoreAccountInfo accountInfo = SyncService.get().getAccountInfo();
  2863. - assert accountInfo != null;
  2864. - SyncSettingsUtils.openTrustedVaultOptInDialog(
  2865. - this, accountInfo, REQUEST_CODE_TRUSTED_VAULT_OPT_IN);
  2866. // Return true to notify the click was handled.
  2867. return true;
  2868. }
  2869. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
  2870. --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
  2871. +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
  2872. @@ -45,7 +45,6 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSecti
  2873. import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.SectionSeparator;
  2874. import org.chromium.chrome.browser.payments.ui.PaymentUiService.PaymentUisShowStateReconciler;
  2875. import org.chromium.chrome.browser.profiles.Profile;
  2876. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2877. import org.chromium.components.autofill.EditableOption;
  2878. import org.chromium.components.autofill.prefeditor.EditorObserverForTest;
  2879. import org.chromium.components.browser_ui.widget.FadingEdgeScrollView;
  2880. @@ -1171,16 +1170,7 @@ public class PaymentRequestUI implements DimmingDialog.OnDismissListener, View.O
  2881. */
  2882. @Nullable
  2883. private String getSignedInUsersEmail() {
  2884. - if (mProfile.isOffTheRecord()) {
  2885. return null;
  2886. - }
  2887. -
  2888. - IdentityManager identityManager =
  2889. - IdentityServicesProvider.get().getIdentityManager(mProfile);
  2890. - if (identityManager == null) return null;
  2891. - CoreAccountInfo info = identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC);
  2892. - if (info == null) return null;
  2893. - return info.getEmail();
  2894. }
  2895. private Callback<SectionInformation> createUpdateSectionCallback(@DataType final int type) {
  2896. 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
  2897. --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
  2898. +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
  2899. @@ -34,9 +34,6 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen
  2900. import org.chromium.chrome.browser.profiles.Profile;
  2901. import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
  2902. import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  2903. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2904. -import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
  2905. -import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
  2906. import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  2907. import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  2908. import org.chromium.components.browser_ui.settings.SpinnerPreference;
  2909. @@ -67,7 +64,6 @@ public class PrivacySettings
  2910. private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
  2911. private static final String PREF_SECURE_DNS = "secure_dns";
  2912. private static final String PREF_DO_NOT_TRACK = "do_not_track";
  2913. - private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
  2914. private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
  2915. private static final String PREF_PROXY_OPTIONS = "proxy";
  2916. private static final String PREF_PRIVACY_REVIEW = "privacy_review";
  2917. @@ -142,9 +138,6 @@ public class PrivacySettings
  2918. Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
  2919. secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
  2920. - Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
  2921. - syncAndServicesLink.setSummary(buildSyncAndServicesLink());
  2922. -
  2923. // set up history expire days threshold preference
  2924. List<TimeFrequencySpinnerOption> options = new ArrayList<>();
  2925. options.add(new TimeFrequencySpinnerOption(0,
  2926. @@ -182,30 +175,6 @@ public class PrivacySettings
  2927. updatePreferences();
  2928. }
  2929. - private SpannableString buildSyncAndServicesLink() {
  2930. - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  2931. - NoUnderlineClickableSpan servicesLink = new NoUnderlineClickableSpan(getContext(), v -> {
  2932. - settingsLauncher.launchSettingsActivity(getActivity(), GoogleServicesSettings.class);
  2933. - });
  2934. - if (IdentityServicesProvider.get()
  2935. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  2936. - .getPrimaryAccountInfo(ConsentLevel.SYNC)
  2937. - == null) {
  2938. - // Sync is off, show the string with one link to "Google Services".
  2939. - return SpanApplier.applySpans(
  2940. - getString(R.string.privacy_sync_and_services_link_sync_off),
  2941. - new SpanApplier.SpanInfo("<link>", "</link>", servicesLink));
  2942. - }
  2943. - // Otherwise, show the string with both links to "Sync" and "Google Services".
  2944. - NoUnderlineClickableSpan syncLink = new NoUnderlineClickableSpan(getContext(), v -> {
  2945. - settingsLauncher.launchSettingsActivity(getActivity(), ManageSyncSettings.class,
  2946. - ManageSyncSettings.createArguments(false));
  2947. - });
  2948. - return SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link_sync_on),
  2949. - new SpanApplier.SpanInfo("<link1>", "</link1>", syncLink),
  2950. - new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
  2951. - }
  2952. -
  2953. public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
  2954. public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
  2955. 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
  2956. --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
  2957. +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
  2958. @@ -4,7 +4,6 @@
  2959. package org.chromium.chrome.browser.settings;
  2960. -import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.hasChosenToSyncPasswords;
  2961. import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.usesUnifiedPasswordManagerUI;
  2962. import android.content.Context;
  2963. @@ -37,15 +36,6 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  2964. import org.chromium.chrome.browser.preferences.Pref;
  2965. import org.chromium.chrome.browser.profiles.Profile;
  2966. import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  2967. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  2968. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  2969. -import org.chromium.chrome.browser.signin.services.SigninManager;
  2970. -import org.chromium.chrome.browser.sync.SyncService;
  2971. -import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
  2972. -import org.chromium.chrome.browser.sync.settings.SignInPreference;
  2973. -import org.chromium.chrome.browser.sync.settings.SyncPromoPreference;
  2974. -import org.chromium.chrome.browser.sync.settings.SyncPromoPreference.State;
  2975. -import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
  2976. import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarFeatures;
  2977. import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarStatePredictor;
  2978. import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
  2979. @@ -70,14 +60,10 @@ import java.util.Map;
  2980. * The main settings screen, shown when the user first opens Settings.
  2981. */
  2982. public class MainSettings extends PreferenceFragmentCompat
  2983. - implements TemplateUrlService.LoadListener, SyncService.SyncStateChangedListener,
  2984. - SigninManager.SignInStateObserver {
  2985. - public static final String PREF_SYNC_PROMO = "sync_promo";
  2986. + implements TemplateUrlService.LoadListener {
  2987. public static final String PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION =
  2988. "account_and_google_services_section";
  2989. public static final String PREF_SIGN_IN = "sign_in";
  2990. - public static final String PREF_MANAGE_SYNC = "manage_sync";
  2991. - public static final String PREF_GOOGLE_SERVICES = "google_services";
  2992. public static final String PREF_SEARCH_ENGINE = "search_engine";
  2993. public static final String PREF_PASSWORDS = "passwords";
  2994. public static final String PREF_HOMEPAGE = "homepage";
  2995. @@ -95,9 +81,6 @@ public class MainSettings extends PreferenceFragmentCompat
  2996. private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
  2997. private final Map<String, Preference> mAllPreferences = new HashMap<>();
  2998. - private SyncPromoPreference mSyncPromoPreference;
  2999. - private SignInPreference mSignInPreference;
  3000. - private ChromeBasePreference mManageSync;
  3001. private @Nullable PasswordCheck mPasswordCheck;
  3002. private ObservableSupplier<ModalDialogManager> mModalDialogManagerSupplier;
  3003. @@ -129,41 +112,12 @@ public class MainSettings extends PreferenceFragmentCompat
  3004. @Override
  3005. public void onDestroy() {
  3006. super.onDestroy();
  3007. - mSyncPromoPreference.onPreferenceFragmentDestroyed();
  3008. // The component should only be destroyed when the activity has been closed by the user
  3009. // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed
  3010. // by the system.
  3011. if (getActivity().isFinishing() && mPasswordCheck != null) PasswordCheckFactory.destroy();
  3012. }
  3013. - @Override
  3014. - public void onStart() {
  3015. - super.onStart();
  3016. - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
  3017. - Profile.getLastUsedRegularProfile());
  3018. - if (signinManager.isSigninSupported()) {
  3019. - signinManager.addSignInStateObserver(this);
  3020. - }
  3021. - SyncService syncService = SyncService.get();
  3022. - if (syncService != null) {
  3023. - syncService.addSyncStateChangedListener(this);
  3024. - }
  3025. - }
  3026. -
  3027. - @Override
  3028. - public void onStop() {
  3029. - super.onStop();
  3030. - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
  3031. - Profile.getLastUsedRegularProfile());
  3032. - if (signinManager.isSigninSupported()) {
  3033. - signinManager.removeSignInStateObserver(this);
  3034. - }
  3035. - SyncService syncService = SyncService.get();
  3036. - if (syncService != null) {
  3037. - syncService.removeSyncStateChangedListener(this);
  3038. - }
  3039. - }
  3040. -
  3041. @Override
  3042. public void onResume() {
  3043. super.onResume();
  3044. @@ -175,8 +129,6 @@ public class MainSettings extends PreferenceFragmentCompat
  3045. cachePreferences();
  3046. - mSyncPromoPreference.setOnStateChangedCallback(this::onSyncPromoPreferenceStateChanged);
  3047. -
  3048. updatePasswordsPreference();
  3049. if (usesUnifiedPasswordManagerUI()) {
  3050. @@ -228,9 +180,6 @@ public class MainSettings extends PreferenceFragmentCompat
  3051. Preference preference = getPreferenceScreen().getPreference(index);
  3052. mAllPreferences.put(preference.getKey(), preference);
  3053. }
  3054. - mSyncPromoPreference = (SyncPromoPreference) mAllPreferences.get(PREF_SYNC_PROMO);
  3055. - mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
  3056. - mManageSync = (ChromeBasePreference) findPreference(PREF_MANAGE_SYNC);
  3057. }
  3058. private void setManagedPreferenceDelegateForPreference(String key) {
  3059. @@ -239,15 +188,6 @@ public class MainSettings extends PreferenceFragmentCompat
  3060. }
  3061. private void updatePreferences() {
  3062. - if (IdentityServicesProvider.get()
  3063. - .getSigninManager(Profile.getLastUsedRegularProfile())
  3064. - .isSigninSupported()) {
  3065. - addPreferenceIfAbsent(PREF_SIGN_IN);
  3066. - } else {
  3067. - removePreferenceIfPresent(PREF_SIGN_IN);
  3068. - }
  3069. -
  3070. - updateManageSyncPreference();
  3071. updateSearchEnginePreference();
  3072. updatePasswordsPreference();
  3073. @@ -281,37 +221,6 @@ public class MainSettings extends PreferenceFragmentCompat
  3074. if (preference != null) getPreferenceScreen().removePreference(preference);
  3075. }
  3076. - private void updateManageSyncPreference() {
  3077. - String primaryAccountName = CoreAccountInfo.getEmailFrom(
  3078. - IdentityServicesProvider.get()
  3079. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  3080. - .getPrimaryAccountInfo(ConsentLevel.SIGNIN));
  3081. - boolean showManageSync = primaryAccountName != null;
  3082. - mManageSync.setVisible(showManageSync);
  3083. - if (!showManageSync) return;
  3084. -
  3085. - boolean isSyncConsentAvailable =
  3086. - IdentityServicesProvider.get()
  3087. - .getIdentityManager(Profile.getLastUsedRegularProfile())
  3088. - .getPrimaryAccountInfo(ConsentLevel.SYNC)
  3089. - != null;
  3090. - mManageSync.setIcon(SyncSettingsUtils.getSyncStatusIcon(getActivity()));
  3091. - mManageSync.setSummary(SyncSettingsUtils.getSyncStatusSummary(getActivity()));
  3092. - mManageSync.setOnPreferenceClickListener(pref -> {
  3093. - Context context = getContext();
  3094. - if (SyncService.get().isSyncDisabledByEnterprisePolicy()) {
  3095. - SyncSettingsUtils.showSyncDisabledByAdministratorToast(context);
  3096. - } else if (isSyncConsentAvailable) {
  3097. - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  3098. - settingsLauncher.launchSettingsActivity(context, ManageSyncSettings.class);
  3099. - } else {
  3100. - SyncConsentActivityLauncherImpl.get().launchActivityForPromoDefaultFlow(
  3101. - context, SigninAccessPoint.SETTINGS, primaryAccountName);
  3102. - }
  3103. - return true;
  3104. - });
  3105. - }
  3106. -
  3107. private void updateSearchEnginePreference() {
  3108. if (!TemplateUrlServiceFactory.get().isLoaded()) {
  3109. ChromeBasePreference searchEnginePref =
  3110. @@ -348,9 +257,7 @@ public class MainSettings extends PreferenceFragmentCompat
  3111. }
  3112. private boolean shouldShowNewLabelForPasswordsPreference() {
  3113. - return usesUnifiedPasswordManagerUI() && hasChosenToSyncPasswords(SyncService.get())
  3114. - && !UserPrefs.get(Profile.getLastUsedRegularProfile())
  3115. - .getBoolean(Pref.PASSWORDS_PREF_WITH_NEW_LABEL_USED);
  3116. + return false;
  3117. }
  3118. // TODO(crbug.com/1217070): remove this method once UPM feature is rolled out.
  3119. @@ -381,28 +288,6 @@ public class MainSettings extends PreferenceFragmentCompat
  3120. pref.setSummary(isOn ? R.string.text_on : R.string.text_off);
  3121. }
  3122. - // SigninManager.SignInStateObserver implementation.
  3123. - @Override
  3124. - public void onSignedIn() {
  3125. - // After signing in or out of a managed account, preferences may change or become enabled
  3126. - // or disabled.
  3127. - new Handler().post(() -> updatePreferences());
  3128. - }
  3129. -
  3130. - @Override
  3131. - public void onSignedOut() {
  3132. - updatePreferences();
  3133. - }
  3134. -
  3135. - private void onSyncPromoPreferenceStateChanged() {
  3136. - // Remove "Account" section header if the personalized sign-in promo is shown.
  3137. - boolean isShowingPersonalizedSigninPromo =
  3138. - mSyncPromoPreference.getState() == State.PERSONALIZED_SIGNIN_PROMO;
  3139. - findPreference(PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION)
  3140. - .setVisible(!isShowingPersonalizedSigninPromo);
  3141. - mSignInPreference.setIsShowingPersonalizedSigninPromo(isShowingPersonalizedSigninPromo);
  3142. - }
  3143. -
  3144. // TemplateUrlService.LoadListener implementation.
  3145. @Override
  3146. public void onTemplateUrlServiceLoaded() {
  3147. @@ -410,12 +295,6 @@ public class MainSettings extends PreferenceFragmentCompat
  3148. updateSearchEnginePreference();
  3149. }
  3150. - @Override
  3151. - public void syncStateChanged() {
  3152. - updateManageSyncPreference();
  3153. - updatePasswordsPreference();
  3154. - }
  3155. -
  3156. @VisibleForTesting
  3157. public ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
  3158. return mManagedPreferenceDelegate;
  3159. 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
  3160. --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
  3161. +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
  3162. @@ -63,7 +63,6 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckCoordinator;
  3163. import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
  3164. import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl;
  3165. import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
  3166. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  3167. import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
  3168. import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
  3169. import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  3170. @@ -376,17 +375,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
  3171. HelpAndFeedbackLauncherImpl.getInstance());
  3172. }
  3173. if (fragment instanceof SafetyCheckSettingsFragment) {
  3174. - PasswordCheckupClientHelper checkupHelper = null;
  3175. - if (PasswordManagerHelper.canUseUpmCheckup()) {
  3176. - // At this point it can still happen that the helper cannot be created.
  3177. - // In this case, the helper will be null. Safety Check knows to handle
  3178. - // that correctly.
  3179. - checkupHelper = PasswordCheckupClientHelperFactory.getInstance().createHelper();
  3180. - }
  3181. - SafetyCheckCoordinator.create((SafetyCheckSettingsFragment) fragment,
  3182. - new SafetyCheckUpdatesDelegateImpl(this), mSettingsLauncher,
  3183. - SyncConsentActivityLauncherImpl.get(), checkupHelper,
  3184. - getModalDialogManagerSupplier());
  3185. + // not supported
  3186. }
  3187. if (fragment instanceof PasswordCheckFragmentView) {
  3188. PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment,
  3189. 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
  3190. --- a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
  3191. +++ b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
  3192. @@ -26,7 +26,6 @@ import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  3193. import org.chromium.chrome.browser.sharing.SharingAdapter;
  3194. import org.chromium.chrome.browser.sharing.SharingServiceProxy;
  3195. import org.chromium.chrome.browser.sharing.SharingServiceProxy.DeviceInfo;
  3196. -import org.chromium.chrome.browser.sync.SyncService;
  3197. import org.chromium.components.browser_ui.settings.SettingsLauncher;
  3198. import org.chromium.components.sync.protocol.SharingSpecificFields;
  3199. import org.chromium.ui.widget.ButtonCompat;
  3200. @@ -77,13 +76,11 @@ public class SharedClipboardShareActivity
  3201. mask.setOnClickListener(v -> finish());
  3202. ButtonCompat chromeSettingsButton = findViewById(R.id.chrome_settings);
  3203. - if (SyncService.get() == null || !SyncService.get().isSyncRequested()) {
  3204. chromeSettingsButton.setVisibility(View.VISIBLE);
  3205. chromeSettingsButton.setOnClickListener(view -> {
  3206. SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
  3207. settingsLauncher.launchSettingsActivity(ContextUtils.getApplicationContext());
  3208. });
  3209. - }
  3210. onInitialLayoutInflationComplete();
  3211. }
  3212. 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
  3213. --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
  3214. +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
  3215. @@ -78,7 +78,6 @@ import org.chromium.chrome.browser.share.ShareDelegate;
  3216. import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl;
  3217. import org.chromium.chrome.browser.share.crow.CrowIphController;
  3218. import org.chromium.chrome.browser.share.link_to_text.LinkToTextIPHController;
  3219. -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
  3220. import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator;
  3221. import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsService;
  3222. import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
  3223. @@ -99,7 +98,6 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
  3224. import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
  3225. import org.chromium.chrome.browser.ui.default_browser_promo.DefaultBrowserPromoUtils;
  3226. import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  3227. -import org.chromium.chrome.browser.ui.signin.SigninPromoUtil;
  3228. import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider;
  3229. import org.chromium.chrome.browser.ui.tablet.emptybackground.EmptyBackgroundViewWrapper;
  3230. import org.chromium.chrome.browser.vr.VrModuleProvider;
  3231. @@ -903,21 +901,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  3232. return isShowingPromo; } */
  3233. return false;
  3234. }
  3235. -
  3236. - private boolean maybeShowPromo() {
  3237. - // Only one promo can be shown in one run to avoid nagging users too much.
  3238. - if (SigninPromoUtil.launchSigninPromoIfNeeded(mActivity,
  3239. - SyncConsentActivityLauncherImpl.get(), VersionInfo.getProductMajorVersion())) {
  3240. - return true;
  3241. - }
  3242. - if (DefaultBrowserPromoUtils.prepareLaunchPromoIfNeeded(
  3243. - mActivity, mWindowAndroid, false /* ignoreMaxCount */)) {
  3244. - return true;
  3245. - }
  3246. - if (AppLanguagePromoDialog.maybeShowPrompt(mActivity, mModalDialogManagerSupplier,
  3247. - () -> ApplicationLifetime.terminate(true))) {
  3248. - return true;
  3249. - }
  3250. - return LanguageAskPrompt.maybeShowLanguageAskPrompt(mActivity, mModalDialogManagerSupplier);
  3251. - }
  3252. }
  3253. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
  3254. --- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
  3255. +++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
  3256. @@ -39,7 +39,6 @@ import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
  3257. import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  3258. import org.chromium.chrome.browser.profiles.Profile;
  3259. import org.chromium.chrome.browser.segmentation_platform.SegmentationPlatformServiceFactory;
  3260. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  3261. import org.chromium.chrome.browser.tab.Tab;
  3262. import org.chromium.chrome.browser.tab.TabLaunchType;
  3263. import org.chromium.chrome.browser.tabmodel.TabModel;
  3264. @@ -52,7 +51,6 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  3265. import org.chromium.components.embedder_support.util.UrlUtilities;
  3266. import org.chromium.components.optimization_guide.proto.ModelsProto.OptimizationTarget;
  3267. import org.chromium.components.segmentation_platform.SegmentationPlatformService;
  3268. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  3269. import org.chromium.components.user_prefs.UserPrefs;
  3270. import org.chromium.content_public.browser.LoadUrlParams;
  3271. import org.chromium.content_public.common.ResourceRequestBody;
  3272. @@ -565,13 +563,8 @@ public final class ReturnToChromeUtil {
  3273. * Caches the status of whether the primary account is synced.
  3274. */
  3275. public static void cachePrimaryAccountSyncStatus() {
  3276. - boolean isPrimaryAccountSync =
  3277. - IdentityServicesProvider.get()
  3278. - .getSigninManager(Profile.getLastUsedRegularProfile())
  3279. - .getIdentityManager()
  3280. - .hasPrimaryAccount(ConsentLevel.SYNC);
  3281. SharedPreferencesManager.getInstance().writeBoolean(
  3282. - ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, isPrimaryAccountSync);
  3283. + ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, false);
  3284. }
  3285. /**
  3286. diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
  3287. --- a/chrome/browser/BUILD.gn
  3288. +++ b/chrome/browser/BUILD.gn
  3289. @@ -1611,58 +1611,6 @@ static_library("browser") {
  3290. "sharing/web_push/web_push_sender.h",
  3291. "shell_integration.cc",
  3292. "shell_integration.h",
  3293. - "signin/about_signin_internals_factory.cc",
  3294. - "signin/about_signin_internals_factory.h",
  3295. - "signin/account_consistency_mode_manager.cc",
  3296. - "signin/account_consistency_mode_manager.h",
  3297. - "signin/account_consistency_mode_manager_factory.cc",
  3298. - "signin/account_consistency_mode_manager_factory.h",
  3299. - "signin/account_id_from_account_info.cc",
  3300. - "signin/account_id_from_account_info.h",
  3301. - "signin/account_investigator_factory.cc",
  3302. - "signin/account_investigator_factory.h",
  3303. - "signin/account_reconcilor_factory.cc",
  3304. - "signin/account_reconcilor_factory.h",
  3305. - "signin/chrome_device_id_helper.cc",
  3306. - "signin/chrome_device_id_helper.h",
  3307. - "signin/chrome_signin_client.cc",
  3308. - "signin/chrome_signin_client.h",
  3309. - "signin/chrome_signin_client_factory.cc",
  3310. - "signin/chrome_signin_client_factory.h",
  3311. - "signin/chrome_signin_helper.cc",
  3312. - "signin/chrome_signin_helper.h",
  3313. - "signin/chrome_signin_proxying_url_loader_factory.cc",
  3314. - "signin/chrome_signin_proxying_url_loader_factory.h",
  3315. - "signin/chrome_signin_url_loader_throttle.cc",
  3316. - "signin/chrome_signin_url_loader_throttle.h",
  3317. - "signin/cookie_reminter_factory.cc",
  3318. - "signin/cookie_reminter_factory.h",
  3319. - "signin/header_modification_delegate.h",
  3320. - "signin/header_modification_delegate_impl.cc",
  3321. - "signin/header_modification_delegate_impl.h",
  3322. - "signin/identity_manager_factory.cc",
  3323. - "signin/identity_manager_factory.h",
  3324. - "signin/investigator_dependency_provider.cc",
  3325. - "signin/investigator_dependency_provider.h",
  3326. - "signin/primary_account_policy_manager.cc",
  3327. - "signin/primary_account_policy_manager.h",
  3328. - "signin/primary_account_policy_manager_factory.cc",
  3329. - "signin/primary_account_policy_manager_factory.h",
  3330. - "signin/reauth_result.h",
  3331. - "signin/reauth_tab_helper.cc",
  3332. - "signin/reauth_tab_helper.h",
  3333. - "signin/signin_error_controller_factory.cc",
  3334. - "signin/signin_error_controller_factory.h",
  3335. - "signin/signin_features.cc",
  3336. - "signin/signin_features.h",
  3337. - "signin/signin_profile_attributes_updater.cc",
  3338. - "signin/signin_profile_attributes_updater.h",
  3339. - "signin/signin_profile_attributes_updater_factory.cc",
  3340. - "signin/signin_profile_attributes_updater_factory.h",
  3341. - "signin/signin_promo_util.cc",
  3342. - "signin/signin_promo_util.h",
  3343. - "signin/signin_util.cc",
  3344. - "signin/signin_util.h",
  3345. "site_isolation/about_flags.h",
  3346. "site_isolation/prefs_observer.cc",
  3347. "site_isolation/prefs_observer.h",
  3348. @@ -1734,40 +1682,6 @@ static_library("browser") {
  3349. "subresource_filter/subresource_filter_history_observer.h",
  3350. "subresource_filter/subresource_filter_profile_context_factory.cc",
  3351. "subresource_filter/subresource_filter_profile_context_factory.h",
  3352. - "sync/bookmark_sync_service_factory.cc",
  3353. - "sync/bookmark_sync_service_factory.h",
  3354. - "sync/chrome_sync_client.cc",
  3355. - "sync/chrome_sync_client.h",
  3356. - "sync/device_info_sync_client_impl.cc",
  3357. - "sync/device_info_sync_client_impl.h",
  3358. - "sync/device_info_sync_service_factory.cc",
  3359. - "sync/device_info_sync_service_factory.h",
  3360. - "sync/glue/extensions_activity_monitor.cc",
  3361. - "sync/glue/extensions_activity_monitor.h",
  3362. - "sync/glue/sync_start_util.cc",
  3363. - "sync/glue/sync_start_util.h",
  3364. - "sync/model_type_store_service_factory.cc",
  3365. - "sync/model_type_store_service_factory.h",
  3366. - "sync/send_tab_to_self_sync_service_factory.cc",
  3367. - "sync/send_tab_to_self_sync_service_factory.h",
  3368. - "sync/session_sync_service_factory.cc",
  3369. - "sync/session_sync_service_factory.h",
  3370. - "sync/sessions/sync_sessions_router_tab_helper.cc",
  3371. - "sync/sessions/sync_sessions_router_tab_helper.h",
  3372. - "sync/sessions/sync_sessions_web_contents_router.cc",
  3373. - "sync/sessions/sync_sessions_web_contents_router.h",
  3374. - "sync/sessions/sync_sessions_web_contents_router_factory.cc",
  3375. - "sync/sessions/sync_sessions_web_contents_router_factory.h",
  3376. - "sync/sync_encryption_keys_tab_helper.cc",
  3377. - "sync/sync_encryption_keys_tab_helper.h",
  3378. - "sync/sync_invalidations_service_factory.cc",
  3379. - "sync/sync_invalidations_service_factory.h",
  3380. - "sync/sync_service_factory.cc",
  3381. - "sync/sync_service_factory.h",
  3382. - "sync/sync_startup_tracker.cc",
  3383. - "sync/sync_startup_tracker.h",
  3384. - "sync/user_event_service_factory.cc",
  3385. - "sync/user_event_service_factory.h",
  3386. "tab_contents/navigation_metrics_recorder.cc",
  3387. "tab_contents/navigation_metrics_recorder.h",
  3388. "tab_contents/tab_util.cc",
  3389. @@ -1993,7 +1907,6 @@ static_library("browser") {
  3390. "//chrome/browser/share",
  3391. "//chrome/browser/sharing:buildflags",
  3392. "//chrome/browser/sharing/proto",
  3393. - "//chrome/browser/signin:identity_manager_provider",
  3394. "//chrome/browser/storage_access_api:permissions",
  3395. "//chrome/browser/thumbnail",
  3396. "//chrome/browser/touch_to_fill",
  3397. @@ -2265,10 +2178,6 @@ static_library("browser") {
  3398. "//components/services/unzip/public/mojom",
  3399. "//components/sessions",
  3400. "//components/shared_highlighting/core/common",
  3401. - "//components/signin/core/browser",
  3402. - "//components/signin/public/base:signin_buildflags",
  3403. - "//components/signin/public/identity_manager",
  3404. - "//components/signin/public/webdata",
  3405. "//components/site_engagement/content",
  3406. "//components/site_engagement/core/mojom:mojo_bindings",
  3407. "//components/site_isolation",
  3408. @@ -2923,16 +2832,6 @@ static_library("browser") {
  3409. "android/service_tab_launcher.h",
  3410. "android/shortcut_helper.cc",
  3411. "android/shortcut_helper.h",
  3412. - "android/signin/fre_mobile_identity_consistency_field_trial.cc",
  3413. - "android/signin/fre_mobile_identity_consistency_field_trial.h",
  3414. - "android/signin/signin_bridge.cc",
  3415. - "android/signin/signin_bridge.h",
  3416. - "android/signin/signin_manager_android.cc",
  3417. - "android/signin/signin_manager_android.h",
  3418. - "android/signin/signin_metrics_utils.cc",
  3419. - "android/signin/unified_consent_service_bridge.cc",
  3420. - "android/signin/web_signin_bridge.cc",
  3421. - "android/signin/web_signin_bridge.h",
  3422. "android/startup_bridge.cc",
  3423. "android/startup_bridge.h",
  3424. "android/survey/http_client_type.cc",
  3425. @@ -3201,16 +3100,10 @@ static_library("browser") {
  3426. "password_check/android/password_check_bridge.h",
  3427. "password_check/android/password_check_manager.cc",
  3428. "password_check/android/password_check_manager.h",
  3429. - "password_manager/android/account_chooser_dialog_android.cc",
  3430. - "password_manager/android/account_chooser_dialog_android.h",
  3431. "password_manager/android/all_passwords_bottom_sheet_controller.cc",
  3432. "password_manager/android/all_passwords_bottom_sheet_controller.h",
  3433. "password_manager/android/all_passwords_bottom_sheet_helper.cc",
  3434. "password_manager/android/all_passwords_bottom_sheet_helper.h",
  3435. - "password_manager/android/auto_signin_first_run_dialog_android.cc",
  3436. - "password_manager/android/auto_signin_first_run_dialog_android.h",
  3437. - "password_manager/android/auto_signin_prompt_controller.cc",
  3438. - "password_manager/android/auto_signin_prompt_controller.h",
  3439. "password_manager/android/credential_android.cc",
  3440. "password_manager/android/credential_android.h",
  3441. "password_manager/android/credential_leak_controller_android.cc",
  3442. @@ -3314,27 +3207,12 @@ static_library("browser") {
  3443. "sharing/sms/sms_fetch_request_handler.cc",
  3444. "sharing/sms/sms_fetch_request_handler.h",
  3445. "shell_integration_android.cc",
  3446. - "signin/identity_services_provider_android.cc",
  3447. - "signin/signin_manager_android_factory.cc",
  3448. - "signin/signin_manager_android_factory.h",
  3449. "ssl/chrome_security_state_client.cc",
  3450. "ssl/chrome_security_state_client.h",
  3451. "ssl/chrome_security_state_model_delegate.cc",
  3452. "ssl/chrome_security_state_model_delegate.h",
  3453. "ssl/known_interception_disclosure_infobar.cc",
  3454. "ssl/known_interception_disclosure_infobar.h",
  3455. - "sync/android/sync_service_android_bridge.cc",
  3456. - "sync/android/sync_service_android_bridge.h",
  3457. - "sync/glue/synced_tab_delegate_android.cc",
  3458. - "sync/glue/synced_tab_delegate_android.h",
  3459. - "sync/glue/synced_window_delegate_android.cc",
  3460. - "sync/glue/synced_window_delegate_android.h",
  3461. - "sync/glue/synced_window_delegates_getter_android.cc",
  3462. - "sync/glue/synced_window_delegates_getter_android.h",
  3463. - "sync/sync_error_infobar_delegate_android.cc",
  3464. - "sync/sync_error_infobar_delegate_android.h",
  3465. - "sync/trusted_vault_client_android.cc",
  3466. - "sync/trusted_vault_client_android.h",
  3467. "tab/web_contents_state.cc",
  3468. "tab/web_contents_state.h",
  3469. "touch_to_fill/touch_to_fill_controller.cc",
  3470. @@ -3411,8 +3289,6 @@ static_library("browser") {
  3471. "//chrome/browser/safety_check/android",
  3472. "//chrome/browser/share/android:jni_headers",
  3473. "//chrome/browser/share/core/crow:crow_configuration",
  3474. - "//chrome/browser/signin/services/android:jni_headers",
  3475. - "//chrome/browser/sync/android:jni_headers",
  3476. "//chrome/browser/tab:jni_headers",
  3477. "//chrome/browser/ui/android/layouts:android",
  3478. "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings",
  3479. @@ -3493,8 +3369,6 @@ static_library("browser") {
  3480. "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util",
  3481. "//components/security_state/content/android",
  3482. "//components/send_tab_to_self",
  3483. - "//components/signin/internal/identity_manager", # cf android/signin/DEPS
  3484. - "//components/signin/public/android:jni_headers",
  3485. "//components/subresource_filter/android",
  3486. "//components/thin_webview/internal",
  3487. "//components/translate/content/android",
  3488. @@ -4270,12 +4144,6 @@ static_library("browser") {
  3489. "sharing_hub/sharing_hub_service.h",
  3490. "sharing_hub/sharing_hub_service_factory.cc",
  3491. "sharing_hub/sharing_hub_service_factory.h",
  3492. - "signin/signin_promo.cc",
  3493. - "signin/signin_promo.h",
  3494. - "signin/signin_ui_delegate.cc",
  3495. - "signin/signin_ui_delegate.h",
  3496. - "signin/signin_ui_util.cc",
  3497. - "signin/signin_ui_util.h",
  3498. "speech/chrome_speech_recognition_service.cc",
  3499. "speech/chrome_speech_recognition_service.h",
  3500. "speech/extension_api/tts_extension_api_constants.cc", # Should be moved
  3501. @@ -5098,8 +4966,6 @@ static_library("browser") {
  3502. "profiles/gaia_info_update_service.h",
  3503. "profiles/gaia_info_update_service_factory.cc",
  3504. "profiles/gaia_info_update_service_factory.h",
  3505. - "signin/chrome_signin_and_sync_status_metrics_provider.cc",
  3506. - "signin/chrome_signin_and_sync_status_metrics_provider.h",
  3507. ]
  3508. if (!is_android && !is_chromeos_lacros) {
  3509. @@ -5353,8 +5219,6 @@ static_library("browser") {
  3510. "notifications/notification_platform_bridge_lacros.cc",
  3511. "notifications/notification_platform_bridge_lacros.h",
  3512. "platform_util_lacros.cc",
  3513. - "signin/signin_ui_delegate_impl_lacros.cc",
  3514. - "signin/signin_ui_delegate_impl_lacros.h",
  3515. "speech/tts_client_factory_lacros.cc",
  3516. "speech/tts_client_factory_lacros.h",
  3517. "speech/tts_client_lacros.cc",
  3518. @@ -6243,12 +6107,6 @@ static_library("browser") {
  3519. "profiles/profile_statistics_common.h",
  3520. "profiles/profile_statistics_factory.cc",
  3521. "profiles/profile_statistics_factory.h",
  3522. - "signin/force_signin_verifier.cc",
  3523. - "signin/force_signin_verifier.h",
  3524. - "signin/signin_manager.cc",
  3525. - "signin/signin_manager.h",
  3526. - "signin/signin_manager_factory.cc",
  3527. - "signin/signin_manager_factory.h",
  3528. "upgrade_detector/get_installed_version.cc",
  3529. "upgrade_detector/get_installed_version.h",
  3530. "upgrade_detector/installed_version_monitor.h",
  3531. @@ -7783,10 +7641,6 @@ static_library("test_support") {
  3532. "resource_coordinator/tab_load_tracker_test_support.h",
  3533. "share/fake_share_history.cc",
  3534. "share/fake_share_history.h",
  3535. - "signin/chrome_signin_client_test_util.cc",
  3536. - "signin/chrome_signin_client_test_util.h",
  3537. - "signin/e2e_tests/test_accounts_util.cc",
  3538. - "signin/e2e_tests/test_accounts_util.h",
  3539. "ssl/ssl_browsertest_util.cc",
  3540. "ssl/ssl_browsertest_util.h",
  3541. "ssl/ssl_client_auth_requestor_mock.cc",
  3542. @@ -7832,7 +7686,6 @@ static_library("test_support") {
  3543. "//components/security_interstitials/content:security_interstitial_page",
  3544. "//components/services/unzip/content",
  3545. "//components/sessions:test_support",
  3546. - "//components/signin/public/identity_manager:test_support",
  3547. "//components/subresource_filter/core/browser:test_support",
  3548. "//components/subresource_filter/core/common:test_support",
  3549. "//components/sync_preferences:test_support",
  3550. @@ -8074,8 +7927,6 @@ if (!is_android) {
  3551. visibility = [ "//chrome/test:test_support_ui" ]
  3552. sources = [
  3553. - "signin/token_revoker_test_utils.cc",
  3554. - "signin/token_revoker_test_utils.h",
  3555. "ui/webui/test_data_source.cc",
  3556. "ui/webui/test_data_source.h",
  3557. "ui/webui/web_ui_test_handler.cc",
  3558. @@ -8091,7 +7942,6 @@ if (!is_android) {
  3559. "//chrome/test/data:web_ui_test_bindings",
  3560. "//components/metrics:test_support",
  3561. "//components/password_manager/core/browser:test_support",
  3562. - "//components/signin/public/identity_manager",
  3563. "//components/sync/driver:test_support",
  3564. "//components/translate/content/common",
  3565. "//content/test:test_support",
  3566. diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
  3567. --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
  3568. +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
  3569. @@ -34,8 +34,6 @@
  3570. #include "chrome/browser/profiles/profile_key.h"
  3571. #include "chrome/browser/query_tiles/tile_service_factory.h"
  3572. #include "chrome/browser/search_engines/template_url_service_factory.h"
  3573. -#include "chrome/browser/signin/identity_manager_factory.h"
  3574. -#include "chrome/browser/sync/sync_service_factory.h"
  3575. #include "chrome/browser/translate/chrome_translate_client.h"
  3576. #include "chrome/browser/ui/browser_command_controller.h"
  3577. #include "chrome/browser/ui/browser_finder.h"
  3578. @@ -55,9 +53,6 @@
  3579. #include "components/omnibox/browser/tab_matcher.h"
  3580. #include "components/omnibox/common/omnibox_features.h"
  3581. #include "components/prefs/pref_service.h"
  3582. -#include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
  3583. -#include "components/signin/public/identity_manager/identity_manager.h"
  3584. -#include "components/sync/driver/sync_service.h"
  3585. #include "components/translate/core/browser/translate_manager.h"
  3586. #include "components/unified_consent/url_keyed_data_collection_consent_helper.h"
  3587. #include "content/public/browser/navigation_entry.h"
  3588. @@ -109,8 +104,7 @@ ChromeAutocompleteProviderClient::ChromeAutocompleteProviderClient(
  3589. : profile_(profile),
  3590. scheme_classifier_(profile),
  3591. url_consent_helper_(unified_consent::UrlKeyedDataCollectionConsentHelper::
  3592. - NewPersonalizedDataCollectionConsentHelper(
  3593. - SyncServiceFactory::GetForProfile(profile_))),
  3594. + NewPersonalizedDataCollectionConsentHelper(nullptr)),
  3595. tab_matcher_(*this, profile_),
  3596. storage_partition_(nullptr),
  3597. omnibox_triggered_feature_service_(
  3598. @@ -300,11 +294,6 @@ ChromeAutocompleteProviderClient::GetOmniboxTriggeredFeatureService() const {
  3599. return omnibox_triggered_feature_service_.get();
  3600. }
  3601. -signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager()
  3602. - const {
  3603. - return IdentityManagerFactory::GetForProfile(profile_);
  3604. -}
  3605. -
  3606. bool ChromeAutocompleteProviderClient::IsAlwaysIncognitoEnabled() const {
  3607. if (profile_->GetPrefs()->GetBoolean(prefs::kAlwaysIncognitoEnabled)) {
  3608. return true;
  3609. @@ -330,15 +319,11 @@ bool ChromeAutocompleteProviderClient::IsPersonalizedUrlDataCollectionActive()
  3610. }
  3611. bool ChromeAutocompleteProviderClient::IsAuthenticated() const {
  3612. - const auto* identity_manager =
  3613. - IdentityManagerFactory::GetForProfile(profile_);
  3614. - return identity_manager &&
  3615. - !identity_manager->GetAccountsInCookieJar().signed_in_accounts.empty();
  3616. + return false;
  3617. }
  3618. bool ChromeAutocompleteProviderClient::IsSyncActive() const {
  3619. - syncer::SyncService* sync = SyncServiceFactory::GetForProfile(profile_);
  3620. - return sync && sync->IsSyncFeatureActive();
  3621. + return false;
  3622. }
  3623. std::string ChromeAutocompleteProviderClient::ProfileUserName() const {
  3624. diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
  3625. --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
  3626. +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
  3627. @@ -76,7 +76,6 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient {
  3628. query_tiles::TileService* GetQueryTileService() const override;
  3629. OmniboxTriggeredFeatureService* GetOmniboxTriggeredFeatureService()
  3630. const override;
  3631. - signin::IdentityManager* GetIdentityManager() const override;
  3632. bool IsOffTheRecord() const override;
  3633. bool IsAlwaysIncognitoEnabled() const override;
  3634. bool SearchSuggestEnabled() const override;
  3635. diff --git a/chrome/browser/autocomplete/document_suggestions_service_factory.cc b/chrome/browser/autocomplete/document_suggestions_service_factory.cc
  3636. --- a/chrome/browser/autocomplete/document_suggestions_service_factory.cc
  3637. +++ b/chrome/browser/autocomplete/document_suggestions_service_factory.cc
  3638. @@ -6,7 +6,6 @@
  3639. #include "base/memory/singleton.h"
  3640. #include "chrome/browser/profiles/profile.h"
  3641. -#include "chrome/browser/signin/identity_manager_factory.h"
  3642. #include "components/keyed_service/content/browser_context_dependency_manager.h"
  3643. #include "components/omnibox/browser/document_suggestions_service.h"
  3644. #include "content/public/browser/storage_partition.h"
  3645. @@ -29,10 +28,8 @@ KeyedService* DocumentSuggestionsServiceFactory::BuildServiceInstanceFor(
  3646. content::BrowserContext* context) const {
  3647. Profile* profile = Profile::FromBrowserContext(context);
  3648. - signin::IdentityManager* identity_manager =
  3649. - IdentityManagerFactory::GetForProfile(profile);
  3650. return new DocumentSuggestionsService(
  3651. - identity_manager, profile->GetDefaultStoragePartition()
  3652. + /* identity_manager */ nullptr, profile->GetDefaultStoragePartition()
  3653. ->GetURLLoaderFactoryForBrowserProcess());
  3654. }
  3655. @@ -40,7 +37,6 @@ DocumentSuggestionsServiceFactory::DocumentSuggestionsServiceFactory()
  3656. : BrowserContextKeyedServiceFactory(
  3657. "DocumentSuggestionsService",
  3658. BrowserContextDependencyManager::GetInstance()) {
  3659. - DependsOn(IdentityManagerFactory::GetInstance());
  3660. }
  3661. DocumentSuggestionsServiceFactory::~DocumentSuggestionsServiceFactory() {}
  3662. diff --git a/chrome/browser/autofill/personal_data_manager_factory.cc b/chrome/browser/autofill/personal_data_manager_factory.cc
  3663. --- a/chrome/browser/autofill/personal_data_manager_factory.cc
  3664. +++ b/chrome/browser/autofill/personal_data_manager_factory.cc
  3665. @@ -11,7 +11,6 @@
  3666. #include "chrome/browser/history/history_service_factory.h"
  3667. #include "chrome/browser/profiles/incognito_helpers.h"
  3668. #include "chrome/browser/profiles/profile.h"
  3669. -#include "chrome/browser/signin/identity_manager_factory.h"
  3670. #include "chrome/browser/web_data_service_factory.h"
  3671. #include "components/autofill/core/browser/personal_data_manager.h"
  3672. #include "components/autofill/core/browser/strike_database.h"
  3673. @@ -60,7 +59,6 @@ PersonalDataManagerFactory::PersonalDataManagerFactory()
  3674. : BrowserContextKeyedServiceFactory(
  3675. "PersonalDataManager",
  3676. BrowserContextDependencyManager::GetInstance()) {
  3677. - DependsOn(IdentityManagerFactory::GetInstance());
  3678. DependsOn(HistoryServiceFactory::GetInstance());
  3679. DependsOn(WebDataServiceFactory::GetInstance());
  3680. DependsOn(StrikeDatabaseFactory::GetInstance());
  3681. @@ -86,7 +84,7 @@ KeyedService* PersonalDataManagerFactory::BuildPersonalDataManager(
  3682. service->Init(local_storage, account_storage, profile->GetPrefs(),
  3683. g_browser_process->local_state(),
  3684. - IdentityManagerFactory::GetForProfile(profile), history_service,
  3685. + nullptr, history_service,
  3686. strike_database, image_fetcher, profile->IsOffTheRecord());
  3687. if (!syncer::IsSyncAllowedByFlag())
  3688. diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
  3689. --- a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
  3690. +++ b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
  3691. @@ -58,14 +58,7 @@ PasswordManagerClient* CommonDependenciesChrome::GetPasswordManagerClient(
  3692. std::string CommonDependenciesChrome::GetSignedInEmail(
  3693. WebContents* web_contents) const {
  3694. - signin::IdentityManager* identity_manager =
  3695. - IdentityManagerFactory::GetForProfile(
  3696. - Profile::FromBrowserContext(web_contents->GetBrowserContext()));
  3697. - if (!identity_manager) {
  3698. return std::string();
  3699. - }
  3700. - return identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync)
  3701. - .email;
  3702. }
  3703. AnnotateDomModelService*
  3704. @@ -78,12 +71,6 @@ bool CommonDependenciesChrome::IsWebLayer() const {
  3705. return false;
  3706. }
  3707. -signin::IdentityManager* CommonDependenciesChrome::GetIdentityManager(
  3708. - content::BrowserContext* browser_context) const {
  3709. - return IdentityManagerFactory::GetForProfile(
  3710. - Profile::FromBrowserContext(browser_context));
  3711. -}
  3712. -
  3713. version_info::Channel CommonDependenciesChrome::GetChannel() const {
  3714. return chrome::GetChannel();
  3715. }
  3716. diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.h b/chrome/browser/autofill_assistant/common_dependencies_chrome.h
  3717. --- a/chrome/browser/autofill_assistant/common_dependencies_chrome.h
  3718. +++ b/chrome/browser/autofill_assistant/common_dependencies_chrome.h
  3719. @@ -44,9 +44,6 @@ class CommonDependenciesChrome : public CommonDependencies {
  3720. bool IsWebLayer() const override;
  3721. - signin::IdentityManager* GetIdentityManager(
  3722. - content::BrowserContext* browser_context) const override;
  3723. -
  3724. version_info::Channel GetChannel() const override;
  3725. };
  3726. diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
  3727. --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
  3728. +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
  3729. @@ -307,8 +307,7 @@ void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
  3730. bool keep_browser_alive) {
  3731. auto* data_types = profile_->GetPrefs()->GetList(
  3732. browsing_data::prefs::kClearBrowsingDataOnExitList);
  3733. - if (data_types && !data_types->GetListDeprecated().empty() &&
  3734. - !SyncServiceFactory::IsSyncAllowed(profile_)) {
  3735. + if (data_types && !data_types->GetListDeprecated().empty()) {
  3736. profile_->GetPrefs()->SetBoolean(
  3737. browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
  3738. auto* remover = profile_->GetBrowsingDataRemover();
  3739. @@ -347,9 +346,6 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
  3740. if (removal_settings.time_to_live_in_hours <= 0)
  3741. continue;
  3742. - if (SyncServiceFactory::IsSyncAllowed(profile_))
  3743. - continue;
  3744. -
  3745. auto deletion_end_time = end_time_for_testing_.value_or(
  3746. base::Time::Now() -
  3747. base::Hours(removal_settings.time_to_live_in_hours));
  3748. diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc
  3749. --- a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc
  3750. +++ b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc
  3751. @@ -13,12 +13,10 @@
  3752. #include "chrome/browser/browsing_data/counters/signin_data_counter.h"
  3753. #include "chrome/browser/profiles/profile.h"
  3754. #include "chrome/browser/signin/account_consistency_mode_manager.h"
  3755. -#include "chrome/browser/signin/identity_manager_factory.h"
  3756. #include "chrome/common/pref_names.h"
  3757. #include "chrome/grit/generated_resources.h"
  3758. #include "components/browsing_data/core/pref_names.h"
  3759. #include "components/prefs/pref_service.h"
  3760. -#include "components/signin/public/identity_manager/identity_manager.h"
  3761. #include "components/strings/grit/components_strings.h"
  3762. #include "ui/base/l10n/l10n_util.h"
  3763. #include "ui/base/text/bytes_formatting.h"
  3764. @@ -53,10 +51,6 @@ std::u16string FormatBytesMBOrHigher(ResultInt bytes) {
  3765. } // namespace
  3766. bool ShouldShowCookieException(Profile* profile) {
  3767. - if (AccountConsistencyModeManager::IsMirrorEnabledForProfile(profile)) {
  3768. - auto* identity_manager = IdentityManagerFactory::GetForProfile(profile);
  3769. - return identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync);
  3770. - }
  3771. #if BUILDFLAG(ENABLE_DICE_SUPPORT)
  3772. if (AccountConsistencyModeManager::IsDiceEnabledForProfile(profile)) {
  3773. return GetSyncStatusMessageType(profile) == SyncStatusMessageType::kSynced;
  3774. diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
  3775. --- a/chrome/browser/chrome_browser_field_trials.cc
  3776. +++ b/chrome/browser/chrome_browser_field_trials.cc
  3777. @@ -101,8 +101,8 @@ void ChromeBrowserFieldTrials::SetUpFeatureControllingFieldTrials(
  3778. }
  3779. }
  3780. -void ChromeBrowserFieldTrials::RegisterSyntheticTrials() {
  3781. -#if BUILDFLAG(IS_ANDROID)
  3782. +void ChromeBrowserFieldTrials::RegisterSyntheticTrials() { // disabled in Bromite
  3783. +#if 0
  3784. static constexpr char kReachedCodeProfilerTrial[] =
  3785. "ReachedCodeProfilerSynthetic2";
  3786. std::string reached_code_profiler_group =
  3787. @@ -176,7 +176,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials() {
  3788. kFREMobileIdentityConsistencyVariationsTrial, variation_group);
  3789. }
  3790. }
  3791. -#endif // BUILDFLAG(IS_ANDROID)
  3792. +#endif // disabled in Bromite
  3793. }
  3794. void ChromeBrowserFieldTrials::InstantiateDynamicTrials() {
  3795. diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
  3796. --- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
  3797. +++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
  3798. @@ -57,7 +57,7 @@ EndpointFetcher::EndpointFetcher(
  3799. annotation_tag,
  3800. profile->GetDefaultStoragePartition()
  3801. ->GetURLLoaderFactoryForBrowserProcess(),
  3802. - IdentityManagerFactory::GetForProfile(profile)) {}
  3803. + nullptr) {}
  3804. EndpointFetcher::EndpointFetcher(
  3805. Profile* const profile,
  3806. diff --git a/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc b/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc
  3807. --- a/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc
  3808. +++ b/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc
  3809. @@ -13,13 +13,10 @@
  3810. #include "chrome/browser/policy/chrome_browser_policy_connector.h"
  3811. #include "chrome/browser/policy/chrome_policy_conversions_client.h"
  3812. #include "chrome/browser/profiles/profile_manager.h"
  3813. -#include "chrome/browser/signin/identity_manager_factory.h"
  3814. #include "components/enterprise/browser/reporting/profile_report_generator.h"
  3815. #include "components/policy/core/browser/policy_conversions.h"
  3816. #include "components/policy/core/browser/policy_conversions_client.h"
  3817. #include "components/policy/proto/device_management_backend.pb.h"
  3818. -#include "components/signin/public/identity_manager/account_info.h"
  3819. -#include "components/signin/public/identity_manager/identity_manager.h"
  3820. namespace enterprise_reporting {
  3821. @@ -37,14 +34,6 @@ bool ProfileReportGeneratorDelegateBase::Init(const base::FilePath& path) {
  3822. void ProfileReportGeneratorDelegateBase::GetSigninUserInfo(
  3823. enterprise_management::ChromeUserProfileInfo* report) {
  3824. - auto account_info =
  3825. - IdentityManagerFactory::GetForProfile(profile_)->GetPrimaryAccountInfo(
  3826. - signin::ConsentLevel::kSync);
  3827. - if (account_info.IsEmpty())
  3828. - return;
  3829. - auto* signed_in_user_info = report->mutable_chrome_signed_in_user();
  3830. - signed_in_user_info->set_email(account_info.email);
  3831. - signed_in_user_info->set_obfuscated_gaia_id(account_info.gaia);
  3832. }
  3833. std::unique_ptr<policy::PolicyConversionsClient>
  3834. diff --git a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc
  3835. --- a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc
  3836. +++ b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc
  3837. @@ -46,7 +46,6 @@ HistoryUiFaviconRequestHandlerFactory::HistoryUiFaviconRequestHandlerFactory()
  3838. BrowserContextDependencyManager::GetInstance()) {
  3839. DependsOn(FaviconServiceFactory::GetInstance());
  3840. DependsOn(LargeIconServiceFactory::GetInstance());
  3841. - DependsOn(SyncServiceFactory::GetInstance());
  3842. }
  3843. HistoryUiFaviconRequestHandlerFactory::
  3844. diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/BUILD.gn
  3845. --- a/chrome/browser/feed/android/BUILD.gn
  3846. +++ b/chrome/browser/feed/android/BUILD.gn
  3847. @@ -97,7 +97,6 @@ android_library("java") {
  3848. "//chrome/browser/privacy:java",
  3849. "//chrome/browser/profiles/android:java",
  3850. "//chrome/browser/share:java",
  3851. - "//chrome/browser/signin/services/android:java",
  3852. "//chrome/browser/tab:java",
  3853. "//chrome/browser/ui/android/appmenu:java",
  3854. "//chrome/browser/ui/android/native_page:java",
  3855. diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
  3856. --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
  3857. +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
  3858. @@ -11,9 +11,7 @@ import org.chromium.chrome.browser.feed.componentinterfaces.SurfaceCoordinator.S
  3859. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  3860. import org.chromium.chrome.browser.preferences.Pref;
  3861. import org.chromium.chrome.browser.profiles.Profile;
  3862. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  3863. import org.chromium.components.prefs.PrefService;
  3864. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  3865. import org.chromium.components.user_prefs.UserPrefs;
  3866. /**
  3867. diff --git a/chrome/browser/feed/feed_service_factory.cc b/chrome/browser/feed/feed_service_factory.cc
  3868. --- a/chrome/browser/feed/feed_service_factory.cc
  3869. +++ b/chrome/browser/feed/feed_service_factory.cc
  3870. @@ -17,7 +17,6 @@
  3871. #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
  3872. #include "chrome/browser/profiles/profile.h"
  3873. #include "chrome/browser/profiles/profile_key.h"
  3874. -#include "chrome/browser/signin/identity_manager_factory.h"
  3875. #include "chrome/common/channel_info.h"
  3876. #include "chrome/common/chrome_version.h"
  3877. #include "components/background_task_scheduler/background_task_scheduler_factory.h"
  3878. @@ -160,7 +159,6 @@ FeedServiceFactory::FeedServiceFactory()
  3879. : BrowserContextKeyedServiceFactory(
  3880. "FeedService",
  3881. BrowserContextDependencyManager::GetInstance()) {
  3882. - DependsOn(IdentityManagerFactory::GetInstance());
  3883. DependsOn(HistoryServiceFactory::GetInstance());
  3884. DependsOn(background_task::BackgroundTaskSchedulerFactory::GetInstance());
  3885. }
  3886. @@ -181,8 +179,6 @@ KeyedService* FeedServiceFactory::BuildServiceInstanceFor(
  3887. content::StoragePartition* storage_partition =
  3888. context->GetDefaultStoragePartition();
  3889. - signin::IdentityManager* identity_manager =
  3890. - IdentityManagerFactory::GetForProfile(profile);
  3891. std::string api_key;
  3892. if (google_apis::IsGoogleChromeAPIKeyUsed()) {
  3893. bool is_stable_channel =
  3894. @@ -223,7 +219,7 @@ KeyedService* FeedServiceFactory::BuildServiceInstanceFor(
  3895. storage_partition->GetProtoDatabaseProvider()->GetDB<feedkvstore::Entry>(
  3896. leveldb_proto::ProtoDbType::FEED_KEY_VALUE_DATABASE,
  3897. feed_dir.AppendASCII("keyvaldb"), background_task_runner),
  3898. - identity_manager,
  3899. + /* identity_manager */ nullptr,
  3900. HistoryServiceFactory::GetForProfile(profile,
  3901. ServiceAccessType::IMPLICIT_ACCESS),
  3902. storage_partition->GetURLLoaderFactoryForBrowserProcess(),
  3903. diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java
  3904. --- a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java
  3905. +++ b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java
  3906. @@ -17,7 +17,7 @@ import java.lang.annotation.RetentionPolicy;
  3907. @IntDef({
  3908. MobileFreProgress.STARTED,
  3909. MobileFreProgress.WELCOME_SHOWN,
  3910. - MobileFreProgress.DEPRECATED_DATA_SAVER_SHOWN,
  3911. + MobileFreProgress.DEPRECATED_DATA_SAVER_SHOWN_DISABLED,
  3912. MobileFreProgress.SYNC_CONSENT_SHOWN,
  3913. MobileFreProgress.SYNC_CONSENT_ACCEPTED,
  3914. MobileFreProgress.SYNC_CONSENT_DISMISSED,
  3915. @@ -33,7 +33,7 @@ import java.lang.annotation.RetentionPolicy;
  3916. public @interface MobileFreProgress {
  3917. int STARTED = 0;
  3918. int WELCOME_SHOWN = 1;
  3919. - int DEPRECATED_DATA_SAVER_SHOWN = 2;
  3920. + int DEPRECATED_DATA_SAVER_SHOWN_DISABLED = 2;
  3921. int SYNC_CONSENT_SHOWN = 3;
  3922. /** The user clicked on the continue button to continue with sync consent. */
  3923. int SYNC_CONSENT_ACCEPTED = 4;
  3924. diff --git a/chrome/browser/gcm/gcm_profile_service_factory.cc b/chrome/browser/gcm/gcm_profile_service_factory.cc
  3925. --- a/chrome/browser/gcm/gcm_profile_service_factory.cc
  3926. +++ b/chrome/browser/gcm/gcm_profile_service_factory.cc
  3927. @@ -13,7 +13,6 @@
  3928. #include "chrome/browser/profiles/incognito_helpers.h"
  3929. #include "chrome/browser/profiles/profile.h"
  3930. #include "chrome/browser/profiles/profile_key.h"
  3931. -#include "chrome/browser/signin/identity_manager_factory.h"
  3932. #include "components/gcm_driver/gcm_profile_service.h"
  3933. #include "components/keyed_service/content/browser_context_dependency_manager.h"
  3934. #include "components/offline_pages/buildflags/buildflags.h"
  3935. @@ -113,7 +112,6 @@ GCMProfileServiceFactory::GCMProfileServiceFactory()
  3936. : BrowserContextKeyedServiceFactory(
  3937. "GCMProfileService",
  3938. BrowserContextDependencyManager::GetInstance()) {
  3939. - DependsOn(IdentityManagerFactory::GetInstance());
  3940. #if BUILDFLAG(ENABLE_OFFLINE_PAGES)
  3941. DependsOn(offline_pages::PrefetchServiceFactory::GetInstance());
  3942. #endif // BUILDFLAG(ENABLE_OFFLINE_PAGES)
  3943. @@ -147,7 +145,7 @@ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
  3944. ->GetURLLoaderFactoryForBrowserProcess(),
  3945. content::GetNetworkConnectionTracker(), chrome::GetChannel(),
  3946. gcm::GetProductCategoryForSubtypes(profile->GetPrefs()),
  3947. - IdentityManagerFactory::GetForProfile(profile),
  3948. + /* identity_manager = */ nullptr,
  3949. std::make_unique<GCMClientFactory>(), content::GetUIThreadTaskRunner({}),
  3950. content::GetIOThreadTaskRunner({}), blocking_task_runner);
  3951. #endif
  3952. diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
  3953. --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
  3954. +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
  3955. @@ -15,7 +15,6 @@
  3956. #include "chrome/browser/gcm/gcm_profile_service_factory.h"
  3957. #include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
  3958. #include "chrome/browser/profiles/profile.h"
  3959. -#include "chrome/browser/signin/identity_manager_factory.h"
  3960. #include "chrome/common/chrome_content_client.h"
  3961. #include "components/gcm_driver/gcm_profile_service.h"
  3962. #include "components/gcm_driver/instance_id/instance_id_profile_service.h"
  3963. @@ -42,36 +41,11 @@
  3964. #endif
  3965. namespace invalidation {
  3966. -namespace {
  3967. -
  3968. -std::unique_ptr<InvalidationService> CreateInvalidationServiceForSenderId(
  3969. - Profile* profile,
  3970. - IdentityProvider* identity_provider,
  3971. - const std::string& sender_id) {
  3972. - auto service = std::make_unique<FCMInvalidationService>(
  3973. - identity_provider,
  3974. - base::BindRepeating(
  3975. - &FCMNetworkHandler::Create,
  3976. - gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
  3977. - instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
  3978. - ->driver()),
  3979. - base::BindRepeating(
  3980. - &PerUserTopicSubscriptionManager::Create, identity_provider,
  3981. - profile->GetPrefs(),
  3982. - base::RetainedRef(profile->GetDefaultStoragePartition()
  3983. - ->GetURLLoaderFactoryForBrowserProcess())),
  3984. - instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
  3985. - ->driver(),
  3986. - profile->GetPrefs(), sender_id);
  3987. - service->Init();
  3988. - return service;
  3989. -}
  3990. -
  3991. -} // namespace
  3992. // static
  3993. ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(
  3994. Profile* profile) {
  3995. + return NULL;
  3996. #if BUILDFLAG(IS_CHROMEOS_ASH)
  3997. // Using ProfileHelper::GetSigninProfile() here would lead to an infinite loop
  3998. // when this method is called during the creation of the sign-in profile
  3999. @@ -85,8 +59,6 @@ ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(
  4000. return NULL;
  4001. }
  4002. #endif
  4003. - return static_cast<ProfileInvalidationProvider*>(
  4004. - GetInstance()->GetServiceForBrowserContext(profile, true));
  4005. }
  4006. // static
  4007. @@ -99,7 +71,6 @@ ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory()
  4008. : BrowserContextKeyedServiceFactory(
  4009. "InvalidationService",
  4010. BrowserContextDependencyManager::GetInstance()) {
  4011. - DependsOn(IdentityManagerFactory::GetInstance());
  4012. DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
  4013. }
  4014. @@ -116,8 +87,6 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
  4015. if (testing_factory_)
  4016. return testing_factory_.Run(context).release();
  4017. - std::unique_ptr<IdentityProvider> identity_provider;
  4018. -
  4019. #if BUILDFLAG(IS_CHROMEOS_ASH)
  4020. policy::BrowserPolicyConnectorAsh* connector =
  4021. g_browser_process->platform_part()->browser_policy_connector_ash();
  4022. @@ -129,20 +98,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
  4023. }
  4024. #endif // BUILDFLAG(IS_CHROMEOS_ASH)
  4025. - Profile* profile = Profile::FromBrowserContext(context);
  4026. -
  4027. - if (!identity_provider) {
  4028. - identity_provider = std::make_unique<ProfileIdentityProvider>(
  4029. - IdentityManagerFactory::GetForProfile(profile));
  4030. - }
  4031. - auto service =
  4032. - CreateInvalidationServiceForSenderId(profile, identity_provider.get(),
  4033. - /* sender_id = */ "");
  4034. - auto custom_sender_id_factory = base::BindRepeating(
  4035. - &CreateInvalidationServiceForSenderId, profile, identity_provider.get());
  4036. - return new ProfileInvalidationProvider(std::move(service),
  4037. - std::move(identity_provider),
  4038. - std::move(custom_sender_id_factory));
  4039. + return NULL;
  4040. }
  4041. void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
  4042. diff --git a/chrome/browser/media/router/discovery/access_code/BUILD.gn b/chrome/browser/media/router/discovery/access_code/BUILD.gn
  4043. --- a/chrome/browser/media/router/discovery/access_code/BUILD.gn
  4044. +++ b/chrome/browser/media/router/discovery/access_code/BUILD.gn
  4045. @@ -55,7 +55,6 @@ if (!is_android) {
  4046. "//chrome/browser/media/router/discovery:discovery",
  4047. "//chrome/browser/media/router/discovery/access_code:discovery_resources_proto",
  4048. "//chrome/browser/profiles:profile",
  4049. - "//chrome/browser/signin:identity_manager_provider",
  4050. "//chrome/browser/ui/webui/access_code_cast:mojo_bindings",
  4051. "//components/cast_channel:cast_channel",
  4052. "//components/keyed_service/content:content",
  4053. diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
  4054. --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
  4055. +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
  4056. @@ -49,7 +49,6 @@
  4057. #include "chrome/browser/metrics/desktop_platform_features_metrics_provider.h"
  4058. #include "chrome/browser/metrics/desktop_session_duration/desktop_profile_session_durations_service_factory.h"
  4059. #include "chrome/browser/metrics/desktop_session_duration/desktop_session_metrics_provider.h"
  4060. -#include "chrome/browser/metrics/family_link_user_metrics_provider.h"
  4061. #include "chrome/browser/metrics/https_engagement_metrics_provider.h"
  4062. #include "chrome/browser/metrics/metrics_reporting_state.h"
  4063. #include "chrome/browser/metrics/network_quality_estimator_provider_impl.h"
  4064. @@ -178,7 +177,6 @@
  4065. #endif
  4066. #if !BUILDFLAG(IS_CHROMEOS_ASH)
  4067. -#include "chrome/browser/signin/chrome_signin_and_sync_status_metrics_provider.h"
  4068. #include "components/metrics/content/accessibility_metrics_provider.h"
  4069. #endif // !BUILDFLAG(IS_CHROMEOS_ASH)
  4070. @@ -771,8 +769,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
  4071. std::make_unique<ChromeAndroidMetricsProvider>(local_state));
  4072. metrics_service_->RegisterMetricsProvider(
  4073. std::make_unique<PageLoadMetricsProvider>());
  4074. - metrics_service_->RegisterMetricsProvider(
  4075. - std::make_unique<FamilyLinkUserMetricsProvider>());
  4076. #else
  4077. metrics_service_->RegisterMetricsProvider(
  4078. std::make_unique<performance_manager::MetricsProvider>(local_state));
  4079. @@ -845,8 +841,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
  4080. #endif // BUILDFLAG(IS_CHROMEOS_ASH)
  4081. #if !BUILDFLAG(IS_CHROMEOS_ASH)
  4082. - metrics_service_->RegisterMetricsProvider(
  4083. - std::make_unique<ChromeSigninAndSyncStatusMetricsProvider>());
  4084. // ChromeOS uses ChromeOSMetricsProvider for accessibility metrics provider.
  4085. metrics_service_->RegisterMetricsProvider(
  4086. std::make_unique<metrics::AccessibilityMetricsProvider>());
  4087. diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn
  4088. --- a/chrome/browser/password_manager/android/BUILD.gn
  4089. +++ b/chrome/browser/password_manager/android/BUILD.gn
  4090. @@ -90,15 +90,12 @@ android_library("java") {
  4091. "//chrome/browser/loading_modal/android:java",
  4092. "//chrome/browser/profiles/android:java",
  4093. "//chrome/browser/settings:java",
  4094. - "//chrome/browser/signin/services/android:java",
  4095. - "//chrome/browser/sync/android:java",
  4096. "//components/browser_ui/settings/android:java",
  4097. "//components/browser_ui/widget/android:java_resources",
  4098. "//components/device_reauth:device_reauth_java_enums",
  4099. "//components/password_manager/core/browser:password_manager_java_enums",
  4100. "//components/password_manager/core/common:password_manager_common_java_enums",
  4101. "//components/signin/public/android:java",
  4102. - "//components/sync/android:sync_java",
  4103. "//components/sync/protocol:protocol_java",
  4104. "//content/public/android:content_java",
  4105. "//third_party/android_deps:guava_android_java",
  4106. @@ -182,14 +179,11 @@ junit_binary("password_manager_junit_tests") {
  4107. "//chrome/browser/flags:java",
  4108. "//chrome/browser/loading_modal/android:java",
  4109. "//chrome/browser/profiles/android:java",
  4110. - "//chrome/browser/signin/services/android:java",
  4111. - "//chrome/browser/sync/android:java",
  4112. "//chrome/test/android:chrome_java_test_support",
  4113. "//components/browser_ui/settings/android:java",
  4114. "//components/password_manager/core/browser:password_manager_java_enums",
  4115. "//components/password_manager/core/common:password_manager_common_java_enums",
  4116. "//components/signin/public/android:java",
  4117. - "//components/sync/android:sync_java",
  4118. "//components/sync/protocol:protocol_java",
  4119. "//third_party/android_deps:guava_android_java",
  4120. "//third_party/android_deps:protobuf_lite_runtime_java",
  4121. diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
  4122. --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
  4123. +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
  4124. @@ -26,11 +26,9 @@ import org.chromium.base.supplier.ObservableSupplier;
  4125. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  4126. import org.chromium.chrome.browser.loading_modal.LoadingModalDialogCoordinator;
  4127. import org.chromium.chrome.browser.password_manager.CredentialManagerLauncher.CredentialManagerError;
  4128. -import org.chromium.chrome.browser.sync.SyncService;
  4129. import org.chromium.components.browser_ui.settings.SettingsLauncher;
  4130. import org.chromium.components.signin.base.CoreAccountInfo;
  4131. import org.chromium.components.signin.base.GoogleServiceAuthError;
  4132. -import org.chromium.components.sync.ModelType;
  4133. import org.chromium.ui.modaldialog.ModalDialogManager;
  4134. import java.lang.annotation.Retention;
  4135. @@ -131,20 +129,10 @@ public class PasswordManagerHelper {
  4136. */
  4137. public static void showPasswordSettings(Context context, @ManagePasswordsReferrer int referrer,
  4138. SettingsLauncher settingsLauncher, CredentialManagerLauncher credentialManagerLauncher,
  4139. - SyncService syncService,
  4140. ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
  4141. RecordHistogram.recordEnumeratedHistogram("PasswordManager.ManagePasswordsReferrer",
  4142. referrer, ManagePasswordsReferrer.MAX_VALUE + 1);
  4143. - if (credentialManagerLauncher != null && hasChosenToSyncPasswords(syncService)
  4144. - && !hasPersistentAuthError(syncService)) {
  4145. - LoadingModalDialogCoordinator loadingDialogCoordinator =
  4146. - LoadingModalDialogCoordinator.create(modalDialogManagerSupplier, context);
  4147. - launchTheCredentialManager(
  4148. - referrer, credentialManagerLauncher, syncService, loadingDialogCoordinator);
  4149. - return;
  4150. - }
  4151. -
  4152. Bundle fragmentArgs = new Bundle();
  4153. fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer);
  4154. context.startActivity(settingsLauncher.createSettingsActivityIntent(
  4155. @@ -155,19 +143,15 @@ public class PasswordManagerHelper {
  4156. // to check whether UPM can be used (for password check as well as for all other cases that
  4157. // share the same preconditions, e.g. launching the credential manager).
  4158. public static boolean canUseUpmCheckup() {
  4159. - SyncService syncService = SyncService.get();
  4160. - return PasswordManagerHelper.usesUnifiedPasswordManagerUI() && syncService != null
  4161. - && hasChosenToSyncPasswords(syncService) && !hasPersistentAuthError(syncService);
  4162. + return false;
  4163. }
  4164. public static void showPasswordCheckup(Context context, @PasswordCheckReferrer int referrer,
  4165. - PasswordCheckupClientHelper checkupClient, SyncService syncService,
  4166. + PasswordCheckupClientHelper checkupClient,
  4167. ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
  4168. if (!usesUnifiedPasswordManagerUI()) return;
  4169. - Optional<String> account = hasChosenToSyncPasswords(syncService)
  4170. - ? Optional.of(CoreAccountInfo.getEmailFrom(syncService.getAccountInfo()))
  4171. - : Optional.absent();
  4172. + Optional<String> account = Optional.absent();
  4173. LoadingModalDialogCoordinator loadingDialogCoordinator =
  4174. LoadingModalDialogCoordinator.create(modalDialogManagerSupplier, context);
  4175. @@ -223,49 +207,6 @@ public class PasswordManagerHelper {
  4176. });
  4177. }
  4178. - /**
  4179. - * Checks whether the sync feature is enabled and the user has chosen to sync passwords.
  4180. - * Note that this doesn't mean that passwords are actively syncing.
  4181. - *
  4182. - * @param syncService the service to query about the sync status.
  4183. - * @return true if syncing passwords is enabled
  4184. - */
  4185. - public static boolean hasChosenToSyncPasswords(SyncService syncService) {
  4186. - return syncService != null && syncService.isSyncFeatureEnabled()
  4187. - && syncService.getChosenDataTypes().contains(ModelType.PASSWORDS);
  4188. - }
  4189. -
  4190. - /**
  4191. - * Checks whether the sync feature is enabled, the user has chosen to sync passwords and
  4192. - * they haven't set up a custom passphrase.
  4193. - * The caller should make sure that the sync engine is initialized before calling this method.
  4194. - *
  4195. - * Note that this doesn't mean that passwords are actively syncing.
  4196. - *
  4197. - * @param syncService the service to query about the sync status.
  4198. - * @return true if syncing passwords is enabled without custom passphrase.
  4199. - */
  4200. - public static boolean hasChosenToSyncPasswordsWithNoCustomPassphrase(SyncService syncService) {
  4201. - assert syncService.isEngineInitialized();
  4202. - return PasswordManagerHelper.hasChosenToSyncPasswords(syncService)
  4203. - && !syncService.isUsingExplicitPassphrase();
  4204. - }
  4205. -
  4206. - /**
  4207. - * Checks whether the user is actively syncing passwords without a custom passphrase.
  4208. - * The caller should make sure that the sync engine is initialized before calling this method.
  4209. - *
  4210. - * @param syncService the service to query about the sync status.
  4211. - * @return true if actively syncing passwords and no custom passphrase was set.
  4212. - */
  4213. - public static boolean isSyncingPasswordsWithNoCustomPassphrase(SyncService syncService) {
  4214. - assert syncService.isEngineInitialized();
  4215. - if (syncService == null || !syncService.hasSyncConsent()) return false;
  4216. - if (!syncService.getActiveDataTypes().contains(ModelType.PASSWORDS)) return false;
  4217. - if (syncService.isUsingExplicitPassphrase()) return false;
  4218. - return true;
  4219. - }
  4220. -
  4221. public static boolean usesUnifiedPasswordManagerUI() {
  4222. if (!ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_ANDROID)) return false;
  4223. @UpmExperimentVariation
  4224. @@ -286,15 +227,15 @@ public class PasswordManagerHelper {
  4225. @VisibleForTesting
  4226. static void launchTheCredentialManager(@ManagePasswordsReferrer int referrer,
  4227. - CredentialManagerLauncher credentialManagerLauncher, SyncService syncService,
  4228. + CredentialManagerLauncher credentialManagerLauncher,
  4229. LoadingModalDialogCoordinator loadingDialogCoordinator) {
  4230. - if (!hasChosenToSyncPasswords(syncService)) return;
  4231. + if ((true)) return;
  4232. loadingDialogCoordinator.show();
  4233. long startTimeMs = SystemClock.elapsedRealtime();
  4234. credentialManagerLauncher.getCredentialManagerIntentForAccount(referrer,
  4235. - CoreAccountInfo.getEmailFrom(syncService.getAccountInfo()),
  4236. + "nobody@example.com",
  4237. (intent)
  4238. -> PasswordManagerHelper.launchCredentialManagerIntent(
  4239. intent, startTimeMs, true, loadingDialogCoordinator),
  4240. @@ -331,29 +272,6 @@ public class PasswordManagerHelper {
  4241. });
  4242. }
  4243. - private static boolean hasPersistentAuthError(@NonNull SyncService syncService) {
  4244. - // TODO(crbug.com/1327311): Ensure that the enum is generated from C++ and maybe
  4245. - // that the transient check is properly mirrored in java to avoid manual code duplication
  4246. - // which is error-prone.
  4247. - switch (syncService.getAuthError()) {
  4248. - // These are failures that are likely to succeed if tried again (or there is no
  4249. - // failure.
  4250. - case GoogleServiceAuthError.State.NONE:
  4251. - case GoogleServiceAuthError.State.CONNECTION_FAILED:
  4252. - case GoogleServiceAuthError.State.SERVICE_UNAVAILABLE:
  4253. - case GoogleServiceAuthError.State.REQUEST_CANCELED:
  4254. - return false;
  4255. - case GoogleServiceAuthError.State.INVALID_GAIA_CREDENTIALS:
  4256. - case GoogleServiceAuthError.State.USER_NOT_SIGNED_UP:
  4257. - case GoogleServiceAuthError.State.UNEXPECTED_SERVICE_RESPONSE:
  4258. - case GoogleServiceAuthError.State.SERVICE_ERROR:
  4259. - return true;
  4260. - default:
  4261. - assert false : "All error values should be classified as persistent or transient";
  4262. - return true;
  4263. - }
  4264. - }
  4265. -
  4266. private static void recordFailureMetrics(
  4267. @CredentialManagerError int error, boolean forAccount) {
  4268. // While support for the local storage API exists in Chrome, it isn't used at this time.
  4269. diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
  4270. --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
  4271. +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
  4272. @@ -8,7 +8,6 @@ import com.google.android.gms.common.api.ApiException;
  4273. import org.chromium.base.annotations.CalledByNative;
  4274. import org.chromium.base.annotations.NativeMethods;
  4275. -import org.chromium.chrome.browser.sync.SyncService;
  4276. import org.chromium.components.signin.base.CoreAccountInfo;
  4277. /**
  4278. @@ -40,12 +39,6 @@ class PasswordSyncControllerDelegateBridgeImpl {
  4279. */
  4280. @CalledByNative
  4281. void notifyCredentialManagerWhenSyncing() {
  4282. - mPasswordSyncControllerDelegate.notifyCredentialManagerWhenSyncing(
  4283. - CoreAccountInfo.getEmailFrom(SyncService.get().getAccountInfo()), () -> {
  4284. - if (mNativeDelegateBridgeImpl == 0) return;
  4285. - PasswordSyncControllerDelegateBridgeImplJni.get().onCredentialManagerNotified(
  4286. - mNativeDelegateBridgeImpl);
  4287. - }, exception -> handleCredentialManagerException(exception));
  4288. }
  4289. /**
  4290. diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
  4291. --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
  4292. +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
  4293. @@ -30,14 +30,11 @@
  4294. #include "chrome/browser/password_manager/account_password_store_factory.h"
  4295. #include "chrome/browser/password_manager/field_info_manager_factory.h"
  4296. #include "chrome/browser/password_manager/password_manager_settings_service_factory.h"
  4297. -#include "chrome/browser/password_manager/password_reuse_manager_factory.h"
  4298. #include "chrome/browser/password_manager/password_scripts_fetcher_factory.h"
  4299. #include "chrome/browser/password_manager/password_store_factory.h"
  4300. #include "chrome/browser/profiles/profile.h"
  4301. #include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
  4302. #include "chrome/browser/safe_browsing/user_interaction_observer.h"
  4303. -#include "chrome/browser/signin/identity_manager_factory.h"
  4304. -#include "chrome/browser/sync/sync_service_factory.h"
  4305. #include "chrome/browser/touch_to_fill/touch_to_fill_webauthn_credential.h"
  4306. #include "chrome/browser/translate/chrome_translate_client.h"
  4307. #include "chrome/browser/ui/passwords/password_generation_popup_controller_impl.h"
  4308. @@ -84,11 +81,7 @@
  4309. #include "components/profile_metrics/browser_profile_type.h"
  4310. #include "components/safe_browsing/buildflags.h"
  4311. #include "components/sessions/content/content_record_password_state.h"
  4312. -#include "components/signin/public/base/signin_metrics.h"
  4313. -#include "components/signin/public/identity_manager/identity_manager.h"
  4314. #include "components/site_isolation/site_isolation_policy.h"
  4315. -#include "components/sync/driver/sync_service.h"
  4316. -#include "components/sync/driver/sync_user_settings.h"
  4317. #include "components/translate/core/browser/translate_manager.h"
  4318. #include "components/version_info/version_info.h"
  4319. #include "content/public/browser/back_forward_cache.h"
  4320. @@ -126,9 +119,6 @@
  4321. #if BUILDFLAG(IS_ANDROID)
  4322. #include "chrome/browser/android/tab_android.h"
  4323. #include "chrome/browser/autofill/manual_filling_controller.h"
  4324. -#include "chrome/browser/password_manager/android/account_chooser_dialog_android.h"
  4325. -#include "chrome/browser/password_manager/android/auto_signin_first_run_dialog_android.h"
  4326. -#include "chrome/browser/password_manager/android/auto_signin_prompt_controller.h"
  4327. #include "chrome/browser/password_manager/android/credential_leak_controller_android.h"
  4328. #include "chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h"
  4329. #include "chrome/browser/password_manager/android/password_accessory_controller.h"
  4330. @@ -193,12 +183,6 @@ namespace {
  4331. static const char kPasswordBreachEntryTrigger[] = "PASSWORD_ENTRY";
  4332. #endif
  4333. -const syncer::SyncService* GetSyncServiceForProfile(Profile* profile) {
  4334. - if (SyncServiceFactory::HasSyncService(profile))
  4335. - return SyncServiceFactory::GetForProfile(profile);
  4336. - return nullptr;
  4337. -}
  4338. -
  4339. // Adds |observer| to the input observers of |widget_host|.
  4340. void AddToWidgetInputEventObservers(
  4341. content::RenderWidgetHost* widget_host,
  4342. @@ -295,10 +279,7 @@ bool ChromePasswordManagerClient::IsFillingFallbackEnabled(
  4343. }
  4344. bool ChromePasswordManagerClient::IsAutoSignInEnabled() const {
  4345. - PasswordManagerSettingsService* settings_service =
  4346. - PasswordManagerSettingsServiceFactory::GetForProfile(profile_);
  4347. - return settings_service->IsSettingEnabled(
  4348. - PasswordManagerSetting::kAutoSignIn);
  4349. + return false;
  4350. }
  4351. bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword(
  4352. @@ -426,13 +407,7 @@ bool ChromePasswordManagerClient::PromptUserToChooseCredentials(
  4353. &PasswordManagerClientHelper::OnCredentialsChosen,
  4354. base::Unretained(&helper_), std::move(callback), local_forms.size() == 1);
  4355. #if BUILDFLAG(IS_ANDROID)
  4356. - // Deletes itself on the event from Java counterpart, when user interacts with
  4357. - // dialog.
  4358. - AccountChooserDialogAndroid* acccount_chooser_dialog =
  4359. - new AccountChooserDialogAndroid(web_contents(), /*client=*/this,
  4360. - std::move(local_forms), origin,
  4361. - std::move(intercept));
  4362. - return acccount_chooser_dialog->ShowDialog();
  4363. + return false;
  4364. #else
  4365. return PasswordsClientUIDelegateFromWebContents(web_contents())
  4366. ->OnChooseCredentials(std::move(local_forms), origin,
  4367. @@ -467,7 +442,6 @@ void ChromePasswordManagerClient::ShowTouchToFill(
  4368. void ChromePasswordManagerClient::OnPasswordSelected(
  4369. const std::u16string& text) {
  4370. - password_reuse_detection_manager_.OnPaste(text);
  4371. }
  4372. #endif
  4373. @@ -518,7 +492,7 @@ void ChromePasswordManagerClient::NotifyUserAutoSignin(
  4374. DCHECK(!local_forms.empty());
  4375. helper_.NotifyUserAutoSignin();
  4376. #if BUILDFLAG(IS_ANDROID)
  4377. - ShowAutoSigninPrompt(web_contents(), local_forms[0]->username_value);
  4378. + // do nothing
  4379. #else
  4380. PasswordsClientUIDelegateFromWebContents(web_contents())
  4381. ->OnAutoSignin(std::move(local_forms), origin);
  4382. @@ -685,10 +659,6 @@ PrefService* ChromePasswordManagerClient::GetPrefs() const {
  4383. return profile_->GetPrefs();
  4384. }
  4385. -const syncer::SyncService* ChromePasswordManagerClient::GetSyncService() const {
  4386. - return GetSyncServiceForProfile(profile_);
  4387. -}
  4388. -
  4389. password_manager::PasswordStoreInterface*
  4390. ChromePasswordManagerClient::GetProfilePasswordStore() const {
  4391. // Always use EXPLICIT_ACCESS as the password manager checks IsIncognito
  4392. @@ -707,11 +677,6 @@ ChromePasswordManagerClient::GetAccountPasswordStore() const {
  4393. .get();
  4394. }
  4395. -password_manager::PasswordReuseManager*
  4396. -ChromePasswordManagerClient::GetPasswordReuseManager() const {
  4397. - return PasswordReuseManagerFactory::GetForProfile(profile_);
  4398. -}
  4399. -
  4400. password_manager::PasswordScriptsFetcher*
  4401. ChromePasswordManagerClient::GetPasswordScriptsFetcher() {
  4402. return PasswordScriptsFetcherFactory::GetForBrowserContext(profile_);
  4403. @@ -723,13 +688,6 @@ ChromePasswordManagerClient::GetPasswordChangeSuccessTracker() {
  4404. GetForBrowserContext(profile_);
  4405. }
  4406. -password_manager::SyncState ChromePasswordManagerClient::GetPasswordSyncState()
  4407. - const {
  4408. - const syncer::SyncService* sync_service =
  4409. - SyncServiceFactory::GetForProfile(profile_);
  4410. - return password_manager_util::GetPasswordSyncState(sync_service);
  4411. -}
  4412. -
  4413. bool ChromePasswordManagerClient::WasLastNavigationHTTPError() const {
  4414. DCHECK(web_contents());
  4415. @@ -765,10 +723,7 @@ net::CertStatus ChromePasswordManagerClient::GetMainFrameCertStatus() const {
  4416. void ChromePasswordManagerClient::PromptUserToEnableAutosignin() {
  4417. #if BUILDFLAG(IS_ANDROID)
  4418. - // Dialog is deleted by the Java counterpart after user interacts with it.
  4419. - AutoSigninFirstRunDialogAndroid* auto_signin_first_run_dialog =
  4420. - new AutoSigninFirstRunDialogAndroid(web_contents());
  4421. - auto_signin_first_run_dialog->ShowDialog();
  4422. + // do nothing
  4423. #else
  4424. PasswordsClientUIDelegateFromWebContents(web_contents())
  4425. ->OnPromptEnableAutoSignin();
  4426. @@ -833,10 +788,6 @@ url::Origin ChromePasswordManagerClient::GetLastCommittedOrigin() const {
  4427. DCHECK(web_contents());
  4428. return web_contents()->GetMainFrame()->GetLastCommittedOrigin();
  4429. }
  4430. -const password_manager::CredentialsFilter*
  4431. -ChromePasswordManagerClient::GetStoreResultFilter() const {
  4432. - return &credentials_filter_;
  4433. -}
  4434. const autofill::LogManager* ChromePasswordManagerClient::GetLogManager() const {
  4435. return log_manager_.get();
  4436. @@ -887,17 +838,6 @@ void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
  4437. }
  4438. #endif // defined(ON_FOCUS_PING_ENABLED)
  4439. -void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
  4440. - PasswordType password_type,
  4441. - const std::string& username,
  4442. - const std::vector<password_manager::MatchingReusedCredential>&
  4443. - matching_reused_credentials,
  4444. - bool password_field_exists) {
  4445. -}
  4446. -
  4447. -void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
  4448. -}
  4449. -
  4450. #if !BUILDFLAG(IS_ANDROID)
  4451. void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
  4452. const GURL& url,
  4453. @@ -961,10 +901,6 @@ favicon::FaviconService* ChromePasswordManagerClient::GetFaviconService() {
  4454. profile_, ServiceAccessType::EXPLICIT_ACCESS);
  4455. }
  4456. -signin::IdentityManager* ChromePasswordManagerClient::GetIdentityManager() {
  4457. - return IdentityManagerFactory::GetForProfile(profile_->GetOriginalProfile());
  4458. -}
  4459. -
  4460. scoped_refptr<network::SharedURLLoaderFactory>
  4461. ChromePasswordManagerClient::GetURLLoaderFactory() {
  4462. return profile_->GetDefaultStoragePartition()
  4463. @@ -1194,18 +1130,14 @@ void ChromePasswordManagerClient::GenerationElementLostFocus() {
  4464. #if BUILDFLAG(IS_ANDROID)
  4465. void ChromePasswordManagerClient::OnImeTextCommittedEvent(
  4466. const std::u16string& text_str) {
  4467. - password_reuse_detection_manager_.OnKeyPressedCommitted(text_str);
  4468. }
  4469. void ChromePasswordManagerClient::OnImeSetComposingTextEvent(
  4470. const std::u16string& text_str) {
  4471. last_composing_text_ = text_str;
  4472. - password_reuse_detection_manager_.OnKeyPressedUncommitted(
  4473. - last_composing_text_);
  4474. }
  4475. void ChromePasswordManagerClient::OnImeFinishComposingTextEvent() {
  4476. - password_reuse_detection_manager_.OnKeyPressedCommitted(last_composing_text_);
  4477. last_composing_text_.clear();
  4478. }
  4479. #endif // BUILDFLAG(IS_ANDROID)
  4480. @@ -1301,34 +1233,13 @@ ChromePasswordManagerClient::ChromePasswordManagerClient(
  4481. profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
  4482. password_manager_(this),
  4483. password_feature_manager_(profile_->GetPrefs(),
  4484. - SyncServiceFactory::GetForProfile(profile_)),
  4485. + nullptr),
  4486. httpauth_manager_(this),
  4487. - password_reuse_detection_manager_(this),
  4488. driver_factory_(nullptr),
  4489. webauthn_credentials_delegate_(this),
  4490. content_credential_manager_(this),
  4491. password_generation_driver_receivers_(web_contents, this),
  4492. observer_(nullptr),
  4493. -#if BUILDFLAG(ENABLE_DICE_SUPPORT)
  4494. - credentials_filter_(
  4495. - this,
  4496. - base::BindRepeating(&GetSyncServiceForProfile, profile_),
  4497. - DiceWebSigninInterceptorFactory::GetForProfile(profile_)),
  4498. - account_storage_auth_helper_(
  4499. - IdentityManagerFactory::GetForProfile(profile_),
  4500. - &password_feature_manager_,
  4501. - base::BindRepeating(
  4502. - [](content::WebContents* web_contents) {
  4503. - Browser* browser =
  4504. - chrome::FindBrowserWithWebContents(web_contents);
  4505. - return browser ? browser->signin_view_controller() : nullptr;
  4506. - },
  4507. - web_contents)),
  4508. -#else
  4509. - credentials_filter_(
  4510. - this,
  4511. - base::BindRepeating(&GetSyncServiceForProfile, profile_)),
  4512. -#endif
  4513. helper_(this) {
  4514. ContentPasswordManagerDriverFactory::CreateForWebContents(web_contents, this,
  4515. autofill_client);
  4516. @@ -1364,8 +1275,6 @@ void ChromePasswordManagerClient::PrimaryPageChanged(content::Page& page) {
  4517. // requests.
  4518. content_credential_manager_.DisconnectBinding();
  4519. - password_reuse_detection_manager_.DidNavigateMainFrame(GetLastCommittedURL());
  4520. -
  4521. AddToWidgetInputEventObservers(page.GetMainDocument().GetRenderWidgetHost(),
  4522. this);
  4523. @@ -1437,7 +1346,6 @@ void ChromePasswordManagerClient::OnPaste() {
  4524. }
  4525. was_on_paste_called_ = true;
  4526. - password_reuse_detection_manager_.OnPaste(std::move(text));
  4527. }
  4528. #endif
  4529. @@ -1460,10 +1368,6 @@ void ChromePasswordManagerClient::OnInputEvent(
  4530. // Android keyboard, ImeTextCommittedEvent is triggered instead.
  4531. if (event.GetType() != blink::WebInputEvent::Type::kKeyDown)
  4532. return;
  4533. - const blink::WebKeyboardEvent& key_event =
  4534. - static_cast<const blink::WebKeyboardEvent&>(event);
  4535. - password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
  4536. -
  4537. #else // !BUILDFLAG(IS_ANDROID)
  4538. if (event.GetType() != blink::WebInputEvent::Type::kChar)
  4539. return;
  4540. @@ -1473,8 +1377,6 @@ void ChromePasswordManagerClient::OnInputEvent(
  4541. // command key is pressed. This detects CTRL+V, COMMAND+V, and CTRL+SHIFT+V.
  4542. if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
  4543. OnPaste();
  4544. - } else {
  4545. - password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
  4546. }
  4547. #endif // BUILDFLAG(IS_ANDROID)
  4548. }
  4549. @@ -1540,19 +1442,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
  4550. // static
  4551. bool ChromePasswordManagerClient::ShouldAnnotateNavigationEntries(
  4552. Profile* profile) {
  4553. - // Only annotate PasswordState onto the navigation entry if user is
  4554. - // opted into UMA and they're not syncing w/ a custom passphrase.
  4555. - if (!ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled())
  4556. - return false;
  4557. -
  4558. - syncer::SyncService* sync_service =
  4559. - SyncServiceFactory::GetForProfile(profile);
  4560. - if (!sync_service || !sync_service->IsSyncFeatureActive() ||
  4561. - sync_service->GetUserSettings()->IsUsingExplicitPassphrase()) {
  4562. return false;
  4563. - }
  4564. -
  4565. - return true;
  4566. }
  4567. void ChromePasswordManagerClient::GenerationResultAvailable(
  4568. diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
  4569. --- a/chrome/browser/password_manager/chrome_password_manager_client.h
  4570. +++ b/chrome/browser/password_manager/chrome_password_manager_client.h
  4571. @@ -31,12 +31,9 @@
  4572. #include "components/password_manager/core/browser/password_manager_client_helper.h"
  4573. #include "components/password_manager/core/browser/password_manager_metrics_recorder.h"
  4574. #include "components/password_manager/core/browser/password_manager_metrics_util.h"
  4575. -#include "components/password_manager/core/browser/password_reuse_detection_manager.h"
  4576. -#include "components/password_manager/core/browser/password_reuse_detector.h"
  4577. #include "components/prefs/pref_member.h"
  4578. #include "components/safe_browsing/buildflags.h"
  4579. #include "components/signin/public/base/signin_buildflags.h"
  4580. -#include "components/sync/driver/sync_service.h"
  4581. #include "content/public/browser/render_frame_host_receiver_set.h"
  4582. #include "content/public/browser/render_widget_host.h"
  4583. #include "content/public/browser/web_contents_observer.h"
  4584. @@ -57,8 +54,6 @@ class TouchToFillController;
  4585. #if BUILDFLAG(ENABLE_DICE_SUPPORT)
  4586. #include "chrome/browser/password_manager/multi_profile_credentials_filter.h"
  4587. #include "chrome/browser/ui/passwords/account_storage_auth_helper.h"
  4588. -#else
  4589. -#include "components/password_manager/core/browser/sync_credentials_filter.h"
  4590. #endif
  4591. class PasswordGenerationPopupObserver;
  4592. @@ -184,18 +179,14 @@ class ChromePasswordManagerClient
  4593. base::OnceCallback<void(ReauthSucceeded)> reauth_callback) override;
  4594. void TriggerSignIn(signin_metrics::AccessPoint access_point) override;
  4595. PrefService* GetPrefs() const override;
  4596. - const syncer::SyncService* GetSyncService() const override;
  4597. password_manager::PasswordStoreInterface* GetProfilePasswordStore()
  4598. const override;
  4599. password_manager::PasswordStoreInterface* GetAccountPasswordStore()
  4600. const override;
  4601. - password_manager::PasswordReuseManager* GetPasswordReuseManager()
  4602. - const override;
  4603. password_manager::PasswordScriptsFetcher* GetPasswordScriptsFetcher()
  4604. override;
  4605. password_manager::PasswordChangeSuccessTracker*
  4606. GetPasswordChangeSuccessTracker() override;
  4607. - password_manager::SyncState GetPasswordSyncState() const override;
  4608. bool WasLastNavigationHTTPError() const override;
  4609. net::CertStatus GetMainFrameCertStatus() const override;
  4610. @@ -211,8 +202,6 @@ class ChromePasswordManagerClient
  4611. bool IsCommittedMainFrameSecure() const override;
  4612. const GURL& GetLastCommittedURL() const override;
  4613. url::Origin GetLastCommittedOrigin() const override;
  4614. - const password_manager::CredentialsFilter* GetStoreResultFilter()
  4615. - const override;
  4616. const autofill::LogManager* GetLogManager() const override;
  4617. void AnnotateNavigationEntry(bool has_password_field) override;
  4618. autofill::LanguageCode GetPageLanguage() const override;
  4619. @@ -225,15 +214,6 @@ class ChromePasswordManagerClient
  4620. const GURL& frame_url) override;
  4621. #endif
  4622. - void CheckProtectedPasswordEntry(
  4623. - password_manager::metrics_util::PasswordType reused_password_type,
  4624. - const std::string& username,
  4625. - const std::vector<password_manager::MatchingReusedCredential>&
  4626. - matching_reused_credentials,
  4627. - bool password_field_exists) override;
  4628. -
  4629. - void LogPasswordReuseDetectedEvent() override;
  4630. -
  4631. // Reporting these events is only supported on desktop platforms.
  4632. #if !BUILDFLAG(IS_ANDROID)
  4633. void MaybeReportEnterpriseLoginEvent(
  4634. @@ -252,7 +232,6 @@ class ChromePasswordManagerClient
  4635. password_manager::PasswordRequirementsService*
  4636. GetPasswordRequirementsService() override;
  4637. favicon::FaviconService* GetFaviconService() override;
  4638. - signin::IdentityManager* GetIdentityManager() override;
  4639. scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
  4640. network::mojom::NetworkContext* GetNetworkContext() const override;
  4641. void UpdateFormManagers() override;
  4642. @@ -377,8 +356,6 @@ class ChromePasswordManagerClient
  4643. password_manager::PasswordManager password_manager_;
  4644. password_manager::PasswordFeatureManagerImpl password_feature_manager_;
  4645. password_manager::HttpAuthManagerImpl httpauth_manager_;
  4646. - password_manager::PasswordReuseDetectionManager
  4647. - password_reuse_detection_manager_;
  4648. #if BUILDFLAG(IS_ANDROID)
  4649. // Holds and facilitates a credential store for each origin in this tab.
  4650. @@ -421,8 +398,6 @@ class ChromePasswordManagerClient
  4651. // MultiProfileCredentialsFilter requires DICE support.
  4652. const MultiProfileCredentialsFilter credentials_filter_;
  4653. AccountStorageAuthHelper account_storage_auth_helper_;
  4654. -#else
  4655. - const password_manager::SyncCredentialsFilter credentials_filter_;
  4656. #endif
  4657. std::unique_ptr<autofill::LogManager> log_manager_;
  4658. diff --git a/chrome/browser/password_manager/password_manager_settings_service_factory.cc b/chrome/browser/password_manager/password_manager_settings_service_factory.cc
  4659. --- a/chrome/browser/password_manager/password_manager_settings_service_factory.cc
  4660. +++ b/chrome/browser/password_manager/password_manager_settings_service_factory.cc
  4661. @@ -7,7 +7,6 @@
  4662. #include "chrome/browser/password_manager/password_manager_settings_service_impl.h"
  4663. #include "chrome/browser/profiles/incognito_helpers.h"
  4664. #include "chrome/browser/profiles/profile.h"
  4665. -#include "chrome/browser/sync/sync_service_factory.h"
  4666. #include "components/keyed_service/content/browser_context_dependency_manager.h"
  4667. #include "components/password_manager/core/browser/password_manager_settings_service.h"
  4668. #include "components/password_manager/core/common/password_manager_features.h"
  4669. @@ -34,7 +33,6 @@ PasswordManagerSettingsServiceFactory::PasswordManagerSettingsServiceFactory()
  4670. : BrowserContextKeyedServiceFactory(
  4671. "PasswordManagerSettingsService",
  4672. BrowserContextDependencyManager::GetInstance()) {
  4673. - DependsOn(SyncServiceFactory::GetInstance());
  4674. }
  4675. PasswordManagerSettingsServiceFactory::
  4676. @@ -44,10 +42,6 @@ KeyedService* PasswordManagerSettingsServiceFactory::BuildServiceInstanceFor(
  4677. content::BrowserContext* context) const {
  4678. Profile* profile = Profile::FromBrowserContext(context);
  4679. #if BUILDFLAG(IS_ANDROID)
  4680. - if (password_manager::features::UsesUnifiedPasswordManagerUi()) {
  4681. - return new PasswordManagerSettingsServiceAndroidImpl(
  4682. - profile->GetPrefs(), SyncServiceFactory::GetForProfile(profile));
  4683. - }
  4684. // Reset the migration pref in case the client is no longer in the enabled
  4685. // group.
  4686. profile->GetPrefs()->SetBoolean(
  4687. diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn
  4688. --- a/chrome/browser/privacy/BUILD.gn
  4689. +++ b/chrome/browser/privacy/BUILD.gn
  4690. @@ -15,8 +15,6 @@ if (is_android) {
  4691. "//chrome/browser/feed/android:*",
  4692. "//chrome/browser/ui/android/omnibox:java",
  4693. "//chrome/browser/ui/android/omnibox:junit",
  4694. - "//chrome/browser/ui/android/signin:java",
  4695. - "//chrome/browser/ui/android/signin:junit",
  4696. ]
  4697. sources = [
  4698. "java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java",
  4699. diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
  4700. --- a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
  4701. +++ b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
  4702. @@ -26,14 +26,6 @@
  4703. android:src="@drawable/privacy_review_msbb_image"
  4704. android:importantForAccessibility="no" />
  4705. - <com.google.android.material.switchmaterial.SwitchMaterial
  4706. - android:id="@+id/msbb_switch"
  4707. - android:layout_marginHorizontal="16dp"
  4708. - android:layout_width="match_parent"
  4709. - android:layout_height="wrap_content"
  4710. - android:showText="false"
  4711. - android:text="@string/url_keyed_anonymized_data_title" />
  4712. -
  4713. <org.chromium.chrome.browser.privacy_review.PrivacyReviewExplanationHeading
  4714. android:layout_width="match_parent"
  4715. android:layout_height="wrap_content"
  4716. diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
  4717. --- a/chrome/browser/profiles/profile_impl.cc
  4718. +++ b/chrome/browser/profiles/profile_impl.cc
  4719. @@ -91,8 +91,6 @@
  4720. #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
  4721. #include "chrome/browser/sessions/exit_type_service.h"
  4722. #include "chrome/browser/sharing/sharing_service_factory.h"
  4723. -#include "chrome/browser/signin/identity_manager_factory.h"
  4724. -#include "chrome/browser/signin/signin_ui_util.h"
  4725. #include "chrome/browser/ssl/https_first_mode_settings_tracker.h"
  4726. #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h"
  4727. #include "chrome/browser/startup_data.h"
  4728. @@ -145,7 +143,6 @@
  4729. #include "components/profile_metrics/browser_profile_type.h"
  4730. #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
  4731. #include "components/signin/public/base/signin_pref_names.h"
  4732. -#include "components/signin/public/identity_manager/identity_manager.h"
  4733. #include "components/site_isolation/site_isolation_policy.h"
  4734. #include "components/spellcheck/spellcheck_buildflags.h"
  4735. #include "components/sync_preferences/pref_service_syncable.h"
  4736. @@ -923,13 +920,6 @@ ProfileImpl::~ProfileImpl() {
  4737. }
  4738. std::string ProfileImpl::GetProfileUserName() const {
  4739. - const signin::IdentityManager* identity_manager =
  4740. - IdentityManagerFactory::GetForProfileIfExists(this);
  4741. - if (identity_manager) {
  4742. - return identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync)
  4743. - .email;
  4744. - }
  4745. -
  4746. return std::string();
  4747. }
  4748. @@ -1501,10 +1491,7 @@ void ProfileImpl::SetCreationTimeForTesting(base::Time creation_time) {
  4749. }
  4750. bool ProfileImpl::IsSignedIn() {
  4751. - signin::IdentityManager* identity_manager =
  4752. - IdentityManagerFactory::GetForProfile(this);
  4753. - return identity_manager &&
  4754. - identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync);
  4755. + return false;
  4756. }
  4757. GURL ProfileImpl::GetHomePage() {
  4758. diff --git a/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc b/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc
  4759. --- a/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc
  4760. +++ b/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc
  4761. @@ -9,7 +9,6 @@
  4762. #include "chrome/browser/history/history_service_factory.h"
  4763. #include "chrome/browser/profiles/incognito_helpers.h"
  4764. #include "chrome/browser/profiles/profile.h"
  4765. -#include "chrome/browser/sync/sync_service_factory.h"
  4766. #include "components/keyed_service/content/browser_context_dependency_manager.h"
  4767. #include "components/safe_browsing/core/browser/sync/safe_browsing_sync_observer_impl.h"
  4768. #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
  4769. @@ -35,7 +34,6 @@ VerdictCacheManagerFactory::VerdictCacheManagerFactory()
  4770. BrowserContextDependencyManager::GetInstance()) {
  4771. DependsOn(HistoryServiceFactory::GetInstance());
  4772. DependsOn(HostContentSettingsMapFactory::GetInstance());
  4773. - DependsOn(SyncServiceFactory::GetInstance());
  4774. }
  4775. KeyedService* VerdictCacheManagerFactory::BuildServiceInstanceFor(
  4776. @@ -46,8 +44,7 @@ KeyedService* VerdictCacheManagerFactory::BuildServiceInstanceFor(
  4777. ServiceAccessType::EXPLICIT_ACCESS),
  4778. HostContentSettingsMapFactory::GetForProfile(profile),
  4779. profile->GetPrefs(),
  4780. - std::make_unique<SafeBrowsingSyncObserverImpl>(
  4781. - SyncServiceFactory::GetForProfile(profile)));
  4782. + std::make_unique<SafeBrowsingSyncObserverImpl>(nullptr));
  4783. }
  4784. content::BrowserContext* VerdictCacheManagerFactory::GetBrowserContextToUse(
  4785. diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java
  4786. --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java
  4787. +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java
  4788. @@ -27,14 +27,10 @@ import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  4789. import org.chromium.chrome.browser.document.ChromeLauncherActivity;
  4790. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  4791. import org.chromium.chrome.browser.profiles.Profile;
  4792. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  4793. import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
  4794. import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  4795. import org.chromium.components.browser_ui.widget.RoundedCornerImageView;
  4796. import org.chromium.components.embedder_support.util.UrlConstants;
  4797. -import org.chromium.components.signin.base.AccountInfo;
  4798. -import org.chromium.components.signin.identitymanager.ConsentLevel;
  4799. -import org.chromium.components.signin.identitymanager.IdentityManager;
  4800. import org.chromium.ui.text.NoUnderlineClickableSpan;
  4801. import org.chromium.ui.text.SpanApplier;
  4802. import org.chromium.ui.widget.Toast;
  4803. @@ -108,41 +104,6 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte
  4804. ListView listView = mContentView.findViewById(R.id.device_picker_list);
  4805. listView.setAdapter(mAdapter);
  4806. listView.setOnItemClickListener(this);
  4807. -
  4808. - createManageDevicesLink(listView);
  4809. - }
  4810. -
  4811. - private void createManageDevicesLink(ListView deviceListView) {
  4812. - ViewGroup containerView = (ViewGroup) LayoutInflater.from(mContext).inflate(
  4813. - R.layout.send_tab_to_self_manage_devices_link, null);
  4814. - deviceListView.addFooterView(containerView);
  4815. -
  4816. - AccountInfo account = getSharingAccountInfo();
  4817. - assert account != null : "The user must be signed in to share a tab";
  4818. -
  4819. - // The avatar can be null in tests.
  4820. - if (account.getAccountImage() != null) {
  4821. - RoundedCornerImageView avatarView = containerView.findViewById(R.id.account_avatar);
  4822. - int accountAvatarSizePx = Math.round(
  4823. - ACCOUNT_AVATAR_SIZE_DP * mContext.getResources().getDisplayMetrics().density);
  4824. - avatarView.setImageBitmap(Bitmap.createScaledBitmap(
  4825. - account.getAccountImage(), accountAvatarSizePx, accountAvatarSizePx, false));
  4826. - avatarView.setRoundedCorners(accountAvatarSizePx / 2, accountAvatarSizePx / 2,
  4827. - accountAvatarSizePx / 2, accountAvatarSizePx / 2);
  4828. - }
  4829. -
  4830. - Resources resources = mContext.getResources();
  4831. - // The link is opened in a new tab to avoid exiting the current page, which the user
  4832. - // possibly wants to share (maybe they just clicked "Manage devices" by mistake).
  4833. - SpannableString linkText = SpanApplier.applySpans(
  4834. - resources.getString(
  4835. - R.string.send_tab_to_self_manage_devices_link, account.getEmail()),
  4836. - new SpanApplier.SpanInfo("<link>", "</link>",
  4837. - new NoUnderlineClickableSpan(
  4838. - mContext, this::openManageDevicesPageInNewTab)));
  4839. - TextView linkView = containerView.findViewById(R.id.manage_devices_link);
  4840. - linkView.setText(linkText);
  4841. - linkView.setMovementMethod(LinkMovementMethod.getInstance());
  4842. }
  4843. private void openManageDevicesPageInNewTab(View unused) {
  4844. @@ -252,11 +213,4 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte
  4845. mController.hideContent(this, true);
  4846. }
  4847. -
  4848. - private static AccountInfo getSharingAccountInfo() {
  4849. - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
  4850. - Profile.getLastUsedRegularProfile());
  4851. - return identityManager.findExtendedAccountInfoByEmailAddress(
  4852. - identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN).getEmail());
  4853. - }
  4854. }
  4855. diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
  4856. --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
  4857. +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
  4858. @@ -11,17 +11,7 @@ import org.chromium.base.Callback;
  4859. import org.chromium.base.Promise;
  4860. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  4861. import org.chromium.chrome.browser.profiles.Profile;
  4862. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  4863. -import org.chromium.chrome.browser.signin.services.SigninManager;
  4864. -import org.chromium.chrome.browser.sync.SyncService;
  4865. -import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerBottomSheetCoordinator;
  4866. -import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerBottomSheetCoordinator.EntryPoint;
  4867. -import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerDelegate;
  4868. import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  4869. -import org.chromium.components.signin.AccountManagerFacadeProvider;
  4870. -import org.chromium.components.signin.AccountUtils;
  4871. -import org.chromium.components.signin.base.GoogleServiceAuthError;
  4872. -import org.chromium.components.sync.ModelType;
  4873. import org.chromium.ui.base.WindowAndroid;
  4874. import java.util.List;
  4875. @@ -30,70 +20,6 @@ import java.util.List;
  4876. * Coordinator for displaying the send tab to self feature.
  4877. */
  4878. public class SendTabToSelfCoordinator {
  4879. - /** Waits for Sync to download the list of target devices after sign-in. */
  4880. - private static class TargetDeviceListWaiter implements SyncService.SyncStateChangedListener {
  4881. - private final Promise<Void> mPromise = new Promise<Void>();
  4882. -
  4883. - public TargetDeviceListWaiter() {
  4884. - SyncService.get().addSyncStateChangedListener(this);
  4885. - fullfillIfReady();
  4886. - }
  4887. -
  4888. - public Promise<Void> waitUntilReady() {
  4889. - return mPromise;
  4890. - }
  4891. -
  4892. - @Override
  4893. - public void syncStateChanged() {
  4894. - fullfillIfReady();
  4895. - }
  4896. -
  4897. - private void fullfillIfReady() {
  4898. - if (SyncService.get().getActiveDataTypes().contains(ModelType.DEVICE_INFO)) {
  4899. - SyncService.get().removeSyncStateChangedListener(this);
  4900. - mPromise.fulfill(null);
  4901. - }
  4902. - }
  4903. - }
  4904. -
  4905. - /** Performs sign-in for the promo shown to signed-out users. */
  4906. - private static class SendTabToSelfAccountPickerDelegate implements AccountPickerDelegate {
  4907. - private final Runnable mShowDeviceListCallback;
  4908. -
  4909. - public SendTabToSelfAccountPickerDelegate(Runnable showDeviceListCallback) {
  4910. - mShowDeviceListCallback = showDeviceListCallback;
  4911. - }
  4912. -
  4913. - @Override
  4914. - public void destroy() {}
  4915. -
  4916. - @Override
  4917. - public void signIn(
  4918. - String accountEmail, Callback<GoogleServiceAuthError> onSignInErrorCallback) {
  4919. - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
  4920. - Profile.getLastUsedRegularProfile());
  4921. - Account account = AccountUtils.createAccountFromName(accountEmail);
  4922. - signinManager.signin(account, new SigninManager.SignInCallback() {
  4923. - @Override
  4924. - public void onSignInComplete() {
  4925. - new TargetDeviceListWaiter().waitUntilReady().then(
  4926. - unused -> { mShowDeviceListCallback.run(); });
  4927. - }
  4928. -
  4929. - @Override
  4930. - public void onSignInAborted() {
  4931. - // TODO(crbug.com/1219434) Consider calling onSignInErrorCallback here.
  4932. - }
  4933. - });
  4934. - }
  4935. -
  4936. - @Override
  4937. - @EntryPoint
  4938. - public int getEntryPoint() {
  4939. - return EntryPoint.SEND_TAB_TO_SELF;
  4940. - }
  4941. - }
  4942. -
  4943. private final Context mContext;
  4944. private final WindowAndroid mWindowAndroid;
  4945. private final String mUrl;
  4946. @@ -110,18 +36,7 @@ public class SendTabToSelfCoordinator {
  4947. }
  4948. public void show() {
  4949. - if (!shouldOfferSignInPromo()) {
  4950. showDeviceList();
  4951. - return;
  4952. - }
  4953. -
  4954. - Runnable showDeviceListCallback = () -> {
  4955. - // TODO(crbug.com/1219434): The sign-in promo should close itself instead.
  4956. - mController.hideContent(mController.getCurrentSheetContent(), /*animate=*/true);
  4957. - showDeviceList();
  4958. - };
  4959. - new AccountPickerBottomSheetCoordinator(mWindowAndroid, mController,
  4960. - new SendTabToSelfAccountPickerDelegate(showDeviceListCallback));
  4961. }
  4962. private void showDeviceList() {
  4963. @@ -130,23 +45,6 @@ public class SendTabToSelfCoordinator {
  4964. }
  4965. private boolean shouldOfferSignInPromo() {
  4966. - // There should be some account on the device that can sign in to Chrome.
  4967. - List<Account> accounts = AccountUtils.getAccountsIfFulfilledOrEmpty(
  4968. - AccountManagerFacadeProvider.getInstance().getAccounts());
  4969. - if (accounts.isEmpty()) {
  4970. - return false;
  4971. - }
  4972. -
  4973. - Profile profile = Profile.getLastUsedRegularProfile();
  4974. - if (!IdentityServicesProvider.get().getSigninManager(profile).isSigninAllowed()) {
  4975. - return false;
  4976. - }
  4977. -
  4978. - // There should be no account signed in to Chrome yet.
  4979. - if (SyncService.get().getAccountInfo() != null) {
  4980. - return false;
  4981. - }
  4982. -
  4983. - return ChromeFeatureList.isEnabled(ChromeFeatureList.SEND_TAB_TO_SELF_SIGNIN_PROMO);
  4984. + return false;
  4985. }
  4986. }
  4987. diff --git a/chrome/browser/ui/android/infobars/save_password_infobar.cc b/chrome/browser/ui/android/infobars/save_password_infobar.cc
  4988. --- a/chrome/browser/ui/android/infobars/save_password_infobar.cc
  4989. +++ b/chrome/browser/ui/android/infobars/save_password_infobar.cc
  4990. @@ -41,14 +41,11 @@ SavePasswordInfoBar::CreateRenderInfoBar(
  4991. ConvertUTF16ToJavaString(env, save_password_delegate->GetMessageText());
  4992. ScopedJavaLocalRef<jstring> details_message_text = ConvertUTF16ToJavaString(
  4993. env, save_password_delegate->GetDetailsMessageText());
  4994. - ScopedJavaLocalRef<jobject> account_info =
  4995. - !account_info_.IsEmpty() ? ConvertToJavaAccountInfo(env, account_info_)
  4996. - : nullptr;
  4997. base::android::ScopedJavaLocalRef<jobject> infobar;
  4998. infobar.Reset(Java_SavePasswordInfoBar_show(
  4999. env, resource_id_mapper.Run(delegate()->GetIconId()), message_text,
  5000. - details_message_text, ok_button_text, cancel_button_text, account_info));
  5001. + details_message_text, ok_button_text, cancel_button_text));
  5002. java_infobar_.Reset(env, infobar.obj());
  5003. return infobar;
  5004. diff --git a/chrome/browser/ui/android/infobars/update_password_infobar.cc b/chrome/browser/ui/android/infobars/update_password_infobar.cc
  5005. --- a/chrome/browser/ui/android/infobars/update_password_infobar.cc
  5006. +++ b/chrome/browser/ui/android/infobars/update_password_infobar.cc
  5007. @@ -45,9 +45,6 @@ UpdatePasswordInfoBar::CreateRenderInfoBar(
  5008. ConvertUTF16ToJavaString(env, update_password_delegate->GetMessageText());
  5009. ScopedJavaLocalRef<jstring> details_message_text = ConvertUTF16ToJavaString(
  5010. env, update_password_delegate->GetDetailsMessageText());
  5011. - ScopedJavaLocalRef<jobject> account_info =
  5012. - !account_info_.IsEmpty() ? ConvertToJavaAccountInfo(env, account_info_)
  5013. - : nullptr;
  5014. std::vector<std::u16string> usernames;
  5015. unsigned int selected_username =
  5016. update_password_delegate->GetDisplayUsernames(&usernames);
  5017. @@ -57,8 +54,7 @@ UpdatePasswordInfoBar::CreateRenderInfoBar(
  5018. base::android::ScopedJavaLocalRef<jobject> infobar;
  5019. infobar.Reset(Java_UpdatePasswordInfoBar_show(
  5020. env, resource_id_mapper.Run(delegate()->GetIconId()), display_usernames,
  5021. - selected_username, message_text, details_message_text, ok_button_text,
  5022. - account_info));
  5023. + selected_username, message_text, details_message_text, ok_button_text));
  5024. java_infobar_.Reset(env, infobar.obj());
  5025. return infobar;
  5026. diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
  5027. --- a/chrome/browser/ui/android/omnibox/BUILD.gn
  5028. +++ b/chrome/browser/ui/android/omnibox/BUILD.gn
  5029. @@ -156,7 +156,6 @@ android_library("java") {
  5030. "//chrome/browser/profiles/android:java",
  5031. "//chrome/browser/search_engines/android:java",
  5032. "//chrome/browser/share:java",
  5033. - "//chrome/browser/signin/services/android:java",
  5034. "//chrome/browser/tab:java",
  5035. "//chrome/browser/tabmodel:java",
  5036. "//chrome/browser/ui/android/favicon:java",
  5037. @@ -396,7 +395,6 @@ android_library("junit") {
  5038. "//chrome/browser/prefetch/android:java",
  5039. "//chrome/browser/privacy:java",
  5040. "//chrome/browser/profiles/android:java",
  5041. - "//chrome/browser/signin/services/android:java",
  5042. "//chrome/browser/tab:java",
  5043. "//chrome/browser/ui/android/favicon:java",
  5044. "//chrome/browser/ui/android/theme:java",
  5045. diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
  5046. --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
  5047. +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
  5048. @@ -55,7 +55,6 @@ import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
  5049. import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
  5050. import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
  5051. import org.chromium.chrome.browser.profiles.Profile;
  5052. -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  5053. import org.chromium.chrome.browser.tab.Tab;
  5054. import org.chromium.chrome.browser.theme.ThemeUtils;
  5055. import org.chromium.chrome.browser.ui.native_page.NativePage;
  5056. diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
  5057. --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
  5058. +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
  5059. @@ -306,9 +306,6 @@ CHAR_LIMIT guidelines:
  5060. <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]">
  5061. Sign in to Chrome
  5062. </message>
  5063. - <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.">
  5064. - You are currently customizing your Sync settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up
  5065. - </message>
  5066. <message name="IDS_SIGNIN_PREF_SUMMARY" desc="Summary for the entry in Settings to sign in to Chrome, explaining benefits of signing in.">
  5067. Sync and personalize across devices
  5068. </message>
  5069. @@ -418,21 +415,6 @@ CHAR_LIMIT guidelines:
  5070. <message name="IDS_PRELOAD_PAGES_EXTENDED_PRELOADING_BULLET_FOUR" desc="Fourth bullet point under the Preload Pages extended preloading mode. Informs the user about what the extended preloading setting does.">
  5071. Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account.
  5072. </message>
  5073. - <message name="IDS_URL_KEYED_ANONYMIZED_DATA_TITLE" desc="Title for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
  5074. - Make searches and browsing better
  5075. - </message>
  5076. - <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.">
  5077. - Sends URLs of pages you visit to Google
  5078. - </message>
  5079. - <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK_LEGACY" desc="The text for Privacy preferences that is shown after all preference rows.">
  5080. - 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>
  5081. - </message>
  5082. - <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.">
  5083. - 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>
  5084. - </message>
  5085. - <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.">
  5086. - 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>
  5087. - </message>
  5088. <!-- Metrics settings -->
  5089. <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]">
  5090. diff --git a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java
  5091. --- a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java
  5092. +++ b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java
  5093. @@ -54,9 +54,6 @@ public interface AssistantStaticDependencies {
  5094. AssistantSettingsUtil createSettingsUtil();
  5095. - @CalledByNative
  5096. - AssistantAccessTokenUtil createAccessTokenUtil();
  5097. -
  5098. BrowserContextHandle getBrowserContext();
  5099. @CalledByNative
  5100. diff --git a/components/autofill_assistant/browser/android/dependencies_android.cc b/components/autofill_assistant/browser/android/dependencies_android.cc
  5101. --- a/components/autofill_assistant/browser/android/dependencies_android.cc
  5102. +++ b/components/autofill_assistant/browser/android/dependencies_android.cc
  5103. @@ -51,13 +51,6 @@ ScopedJavaGlobalRef<jobject> DependenciesAndroid::CreateInfoPageUtil() const {
  5104. AttachCurrentThread(), jstatic_dependencies_));
  5105. }
  5106. -ScopedJavaGlobalRef<jobject> DependenciesAndroid::CreateAccessTokenUtil()
  5107. - const {
  5108. - return ScopedJavaGlobalRef<jobject>(
  5109. - Java_AssistantStaticDependencies_createAccessTokenUtil(
  5110. - AttachCurrentThread(), jstatic_dependencies_));
  5111. -}
  5112. -
  5113. ScopedJavaGlobalRef<jobject> DependenciesAndroid::CreateImageFetcher() const {
  5114. return ScopedJavaGlobalRef<jobject>(
  5115. Java_AssistantStaticDependencies_createImageFetcher(
  5116. diff --git a/components/autofill_assistant/browser/common_dependencies.h b/components/autofill_assistant/browser/common_dependencies.h
  5117. --- a/components/autofill_assistant/browser/common_dependencies.h
  5118. +++ b/components/autofill_assistant/browser/common_dependencies.h
  5119. @@ -62,9 +62,6 @@ class CommonDependencies {
  5120. virtual bool IsWebLayer() const = 0;
  5121. - virtual signin::IdentityManager* GetIdentityManager(
  5122. - content::BrowserContext* browser_context) const = 0;
  5123. -
  5124. virtual version_info::Channel GetChannel() const = 0;
  5125. };
  5126. diff --git a/components/autofill_assistant/browser/headless/client_headless.cc b/components/autofill_assistant/browser/headless/client_headless.cc
  5127. --- a/components/autofill_assistant/browser/headless/client_headless.cc
  5128. +++ b/components/autofill_assistant/browser/headless/client_headless.cc
  5129. @@ -19,7 +19,6 @@
  5130. #include "components/autofill_assistant/browser/empty_website_login_manager_impl.h"
  5131. #include "components/autofill_assistant/browser/features.h"
  5132. #include "components/autofill_assistant/browser/public/ui_state.h"
  5133. -#include "components/autofill_assistant/browser/service/access_token_fetcher.h"
  5134. #include "components/autofill_assistant/browser/switches.h"
  5135. #include "components/autofill_assistant/browser/website_login_manager_impl.h"
  5136. #include "components/password_manager/content/browser/password_change_success_tracker_factory.h"
  5137. @@ -37,9 +36,6 @@
  5138. namespace autofill_assistant {
  5139. -const char kOAuth2Scope[] = "https://www.googleapis.com/auth/userinfo.profile";
  5140. -const char kConsumerName[] = "autofill_assistant";
  5141. -
  5142. ClientHeadless::ClientHeadless(
  5143. content::WebContents* web_contents,
  5144. const CommonDependencies* common_dependencies,
  5145. @@ -175,14 +171,6 @@ void ClientHeadless::FetchAccessToken(
  5146. base::OnceCallback<void(bool, const std::string&)> callback) {
  5147. DCHECK(!fetch_access_token_callback_);
  5148. fetch_access_token_callback_ = std::move(callback);
  5149. - auto* identity_manager = common_dependencies_->GetIdentityManager(
  5150. - GetWebContents()->GetBrowserContext());
  5151. - access_token_fetcher_ = identity_manager->CreateAccessTokenFetcherForAccount(
  5152. - identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSync),
  5153. - kConsumerName, {kOAuth2Scope},
  5154. - base::BindOnce(&ClientHeadless::OnAccessTokenFetchComplete,
  5155. - weak_ptr_factory_.GetWeakPtr()),
  5156. - signin::AccessTokenFetcher::Mode::kImmediate);
  5157. }
  5158. void ClientHeadless::OnAccessTokenFetchComplete(
  5159. @@ -203,11 +191,6 @@ void ClientHeadless::OnAccessTokenFetchComplete(
  5160. }
  5161. void ClientHeadless::InvalidateAccessToken(const std::string& access_token) {
  5162. - auto* identity_manager = common_dependencies_->GetIdentityManager(
  5163. - GetWebContents()->GetBrowserContext());
  5164. - identity_manager->RemoveAccessTokenFromCache(
  5165. - identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSync),
  5166. - {kOAuth2Scope}, access_token);
  5167. }
  5168. } // namespace autofill_assistant
  5169. diff --git a/components/autofill_assistant/browser/headless/client_headless.h b/components/autofill_assistant/browser/headless/client_headless.h
  5170. --- a/components/autofill_assistant/browser/headless/client_headless.h
  5171. +++ b/components/autofill_assistant/browser/headless/client_headless.h
  5172. @@ -89,7 +89,6 @@ class ClientHeadless : public Client, public AccessTokenFetcher {
  5173. std::unique_ptr<WebsiteLoginManager> website_login_manager_;
  5174. std::unique_ptr<HeadlessUiController> headless_ui_controller_;
  5175. raw_ptr<signin::IdentityManager> identity_manager_ = nullptr;
  5176. - std::unique_ptr<signin::AccessTokenFetcher> access_token_fetcher_;
  5177. base::OnceCallback<void(bool, const std::string&)>
  5178. fetch_access_token_callback_;
  5179. diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h
  5180. --- a/components/omnibox/browser/autocomplete_provider_client.h
  5181. +++ b/components/omnibox/browser/autocomplete_provider_client.h
  5182. @@ -52,10 +52,6 @@ namespace component_updater {
  5183. class ComponentUpdateService;
  5184. }
  5185. -namespace signin {
  5186. -class IdentityManager;
  5187. -}
  5188. -
  5189. namespace query_tiles {
  5190. class TileService;
  5191. }
  5192. @@ -125,9 +121,6 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
  5193. virtual component_updater::ComponentUpdateService*
  5194. GetComponentUpdateService() = 0;
  5195. - // Returns the signin::IdentityManager associated with the current profile.
  5196. - virtual signin::IdentityManager* GetIdentityManager() const = 0;
  5197. -
  5198. virtual bool IsOffTheRecord() const = 0;
  5199. virtual bool IsAlwaysIncognitoEnabled() const = 0;
  5200. virtual bool SearchSuggestEnabled() const = 0;
  5201. diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
  5202. --- a/components/password_manager/core/browser/BUILD.gn
  5203. +++ b/components/password_manager/core/browser/BUILD.gn
  5204. @@ -174,15 +174,6 @@ static_library("browser") {
  5205. "password_notes_table.h",
  5206. "password_requirements_service.cc",
  5207. "password_requirements_service.h",
  5208. - "password_reuse_detection_manager.cc",
  5209. - "password_reuse_detection_manager.h",
  5210. - "password_reuse_detector.cc",
  5211. - "password_reuse_detector.h",
  5212. - "password_reuse_detector_consumer.cc",
  5213. - "password_reuse_detector_consumer.h",
  5214. - "password_reuse_manager.h",
  5215. - "password_reuse_manager_impl.cc",
  5216. - "password_reuse_manager_impl.h",
  5217. "password_save_manager.h",
  5218. "password_save_manager_impl.cc",
  5219. "password_save_manager_impl.h",
  5220. diff --git a/components/password_manager/core/browser/leak_detection_delegate.cc b/components/password_manager/core/browser/leak_detection_delegate.cc
  5221. --- a/components/password_manager/core/browser/leak_detection_delegate.cc
  5222. +++ b/components/password_manager/core/browser/leak_detection_delegate.cc
  5223. @@ -64,7 +64,7 @@ void LeakDetectionDelegate::StartLeakCheck(
  5224. is_likely_signup_form_ = submitted_form_was_likely_signup_form;
  5225. leak_check_ = leak_factory_->TryCreateLeakCheck(
  5226. - this, client_->GetIdentityManager(), client_->GetURLLoaderFactory(),
  5227. + this, nullptr, client_->GetURLLoaderFactory(),
  5228. client_->GetChannel());
  5229. // Reset the helper to avoid notifications from the currently running check.
  5230. helper_.reset();
  5231. diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
  5232. --- a/components/password_manager/core/browser/password_form_manager.cc
  5233. +++ b/components/password_manager/core/browser/password_form_manager.cc
  5234. @@ -38,7 +38,6 @@
  5235. #include "components/password_manager/core/browser/possible_username_data.h"
  5236. #include "components/password_manager/core/browser/statistics_table.h"
  5237. #include "components/password_manager/core/common/password_manager_features.h"
  5238. -#include "components/signin/public/identity_manager/identity_manager.h"
  5239. #include "google_apis/gaia/core_account_id.h"
  5240. #include "third_party/abseil-cpp/absl/types/variant.h"
  5241. @@ -263,27 +262,7 @@ bool PasswordFormManager::WasUnblocklisted() const {
  5242. }
  5243. bool PasswordFormManager::IsMovableToAccountStore() const {
  5244. - DCHECK(
  5245. - client_->GetPasswordFeatureManager()->ShouldShowAccountStorageBubbleUi())
  5246. - << "Ensure that the client supports moving passwords for this user!";
  5247. - signin::IdentityManager* identity_manager = client_->GetIdentityManager();
  5248. - DCHECK(identity_manager);
  5249. - const std::string gaia_id =
  5250. - identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin)
  5251. - .gaia;
  5252. - DCHECK(!gaia_id.empty()) << "Cannot move without signed in user";
  5253. -
  5254. - const std::u16string& username = GetPendingCredentials().username_value;
  5255. - const std::u16string& password = GetPendingCredentials().password_value;
  5256. - // If no match in the profile store with the same username and password exist,
  5257. - // then there is nothing to move.
  5258. - auto is_movable = [&](const PasswordForm* match) {
  5259. - return !match->IsUsingAccountStore() && match->username_value == username &&
  5260. - match->password_value == password;
  5261. - };
  5262. - return base::ranges::any_of(form_fetcher_->GetBestMatches(), is_movable) &&
  5263. - !form_fetcher_->IsMovingBlocked(GaiaIdHash::FromGaiaId(gaia_id),
  5264. - username);
  5265. + return false;
  5266. }
  5267. void PasswordFormManager::Save() {
  5268. @@ -448,17 +427,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() {
  5269. void PasswordFormManager::BlockMovingCredentialsToAccountStore() {
  5270. // Nothing to do if there is no signed in user or the credentials are already
  5271. // blocked for moving.
  5272. - if (!IsMovableToAccountStore())
  5273. - return;
  5274. - const std::string gaia_id =
  5275. - client_->GetIdentityManager()
  5276. - ->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin)
  5277. - .gaia;
  5278. - // The above call to IsMovableToAccountStore() guarantees there is a signed in
  5279. - // user.
  5280. - DCHECK(!gaia_id.empty());
  5281. - password_save_manager_->BlockMovingToAccountStoreFor(
  5282. - GaiaIdHash::FromGaiaId(gaia_id));
  5283. }
  5284. bool PasswordFormManager::IsNewLogin() const {
  5285. diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
  5286. --- a/components/password_manager/core/browser/password_manager.cc
  5287. +++ b/components/password_manager/core/browser/password_manager.cc
  5288. @@ -995,7 +995,6 @@ void PasswordManager::OnLoginSuccessful() {
  5289. if (!client_->IsSavingAndFillingEnabled(submitted_form->url))
  5290. return;
  5291. - client_->GetStoreResultFilter()->ReportFormLoginSuccess(*submitted_manager);
  5292. // Check for leaks only if there are no muted credentials.
  5293. if (!HasMutedCredentials(
  5294. submitted_manager->GetInsecureCredentials(),
  5295. @@ -1019,22 +1018,6 @@ void PasswordManager::OnLoginSuccessful() {
  5296. MaybeSavePasswordHash(submitted_manager);
  5297. - // TODO(https://crbug.com/831123): Implement checking whether to save with
  5298. - // PasswordFormManager.
  5299. - // Check whether the filter allows saving this credential. In practice, this
  5300. - // prevents saving the password of the syncing account. However, if the
  5301. - // password is already saved, then *updating* it is still allowed - better
  5302. - // than keeping an outdated password around.
  5303. - if (!submitted_manager->IsPasswordUpdate() &&
  5304. - !client_->GetStoreResultFilter()->ShouldSave(
  5305. - *submitted_manager->GetSubmittedForm())) {
  5306. - RecordProvisionalSaveFailure(
  5307. - PasswordManagerMetricsRecorder::SYNC_CREDENTIAL,
  5308. - submitted_manager->GetURL());
  5309. - ResetSubmittedManager();
  5310. - return;
  5311. - }
  5312. -
  5313. submitted_manager->GetMetricsRecorder()->LogSubmitPassed();
  5314. UMA_HISTOGRAM_BOOLEAN(
  5315. @@ -1083,54 +1066,6 @@ void PasswordManager::MaybeSavePasswordHash(
  5316. std::string username = base::UTF16ToUTF8(submitted_form->username_value);
  5317. if (username.empty())
  5318. return;
  5319. -
  5320. - password_manager::PasswordReuseManager* reuse_manager =
  5321. - client_->GetPasswordReuseManager();
  5322. - // May be null in tests.
  5323. - if (!reuse_manager)
  5324. - return;
  5325. -
  5326. - bool should_save_enterprise_pw =
  5327. - client_->GetStoreResultFilter()->ShouldSaveEnterprisePasswordHash(
  5328. - *submitted_form);
  5329. - bool should_save_gaia_pw =
  5330. - client_->GetStoreResultFilter()->ShouldSaveGaiaPasswordHash(
  5331. - *submitted_form);
  5332. -
  5333. - if (!should_save_enterprise_pw && !should_save_gaia_pw)
  5334. - return;
  5335. -
  5336. - if (password_manager_util::IsLoggingActive(client_)) {
  5337. - BrowserSavePasswordProgressLogger logger(client_->GetLogManager());
  5338. - logger.LogMessage(Logger::STRING_SAVE_PASSWORD_HASH);
  5339. - }
  5340. -
  5341. - // Canonicalizes username if it is an email.
  5342. - if (username.find('@') != std::string::npos)
  5343. - username = gaia::CanonicalizeEmail(username);
  5344. - bool is_password_change = !submitted_form->new_password_element.empty();
  5345. - const std::u16string password = is_password_change
  5346. - ? submitted_form->new_password_value
  5347. - : submitted_form->password_value;
  5348. -
  5349. - if (should_save_enterprise_pw) {
  5350. - reuse_manager->SaveEnterprisePasswordHash(username, password);
  5351. - return;
  5352. - }
  5353. -
  5354. - DCHECK(should_save_gaia_pw);
  5355. - bool is_sync_account_email =
  5356. - client_->GetStoreResultFilter()->IsSyncAccountEmail(username);
  5357. - GaiaPasswordHashChange event =
  5358. - is_sync_account_email
  5359. - ? (is_password_change
  5360. - ? GaiaPasswordHashChange::CHANGED_IN_CONTENT_AREA
  5361. - : GaiaPasswordHashChange::SAVED_IN_CONTENT_AREA)
  5362. - : (is_password_change
  5363. - ? GaiaPasswordHashChange::NOT_SYNC_PASSWORD_CHANGE
  5364. - : GaiaPasswordHashChange::SAVED_IN_CONTENT_AREA);
  5365. - reuse_manager->SaveGaiaPasswordHash(username, password, is_sync_account_email,
  5366. - event);
  5367. }
  5368. void PasswordManager::ProcessAutofillPredictions(
  5369. @@ -1345,23 +1280,6 @@ void PasswordManager::ShowManualFallbackForSaving(
  5370. ShouldBlockPasswordForSameOriginButDifferentScheme(form_data.url)) {
  5371. return;
  5372. }
  5373. -
  5374. - if (!client_->GetStoreResultFilter()->ShouldSave(
  5375. - *form_manager->GetSubmittedForm())) {
  5376. - return;
  5377. - }
  5378. -
  5379. - // Show the fallback if a prompt or a confirmation bubble should be available.
  5380. - bool has_generated_password = form_manager->HasGeneratedPassword();
  5381. - if (ShouldPromptUserToSavePassword(*form_manager) || has_generated_password) {
  5382. - bool is_update = form_manager->IsPasswordUpdate();
  5383. - form_manager->GetMetricsRecorder()->RecordShowManualFallbackForSaving(
  5384. - has_generated_password, is_update);
  5385. - client_->ShowManualFallbackForSaving(form_manager->Clone(),
  5386. - has_generated_password, is_update);
  5387. - } else {
  5388. - HideManualFallbackForSaving();
  5389. - }
  5390. }
  5391. bool PasswordManager::NewFormsParsed(PasswordManagerDriver* driver,
  5392. diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h
  5393. --- a/components/password_manager/core/browser/password_manager_client.h
  5394. +++ b/components/password_manager/core/browser/password_manager_client.h
  5395. @@ -300,18 +300,12 @@ class PasswordManagerClient {
  5396. // Gets prefs associated with this embedder.
  5397. virtual PrefService* GetPrefs() const = 0;
  5398. - // Gets the sync service associated with this client.
  5399. - virtual const syncer::SyncService* GetSyncService() const = 0;
  5400. -
  5401. // Returns the profile PasswordStore associated with this instance.
  5402. virtual PasswordStoreInterface* GetProfilePasswordStore() const = 0;
  5403. // Returns the account PasswordStore associated with this instance.
  5404. virtual PasswordStoreInterface* GetAccountPasswordStore() const = 0;
  5405. - // Returns the PasswordReuseManager associated with this instance.
  5406. - virtual PasswordReuseManager* GetPasswordReuseManager() const = 0;
  5407. -
  5408. // Returns the PasswordScriptsFetcher associated with this instance.
  5409. virtual PasswordScriptsFetcher* GetPasswordScriptsFetcher() = 0;
  5410. @@ -367,9 +361,6 @@ class PasswordManagerClient {
  5411. // Returns last committed origin of the main frame.
  5412. virtual url::Origin GetLastCommittedOrigin() const = 0;
  5413. - // Use this to filter credentials before handling them in password manager.
  5414. - virtual const CredentialsFilter* GetStoreResultFilter() const = 0;
  5415. -
  5416. // Returns a LogManager instance.
  5417. virtual const autofill::LogManager* GetLogManager() const;
  5418. @@ -398,14 +389,6 @@ class PasswordManagerClient {
  5419. // The |username| is the user name of the reused password. The user name
  5420. // can be an email or a username for a non-GAIA or saved-password reuse. No
  5421. // validation has been done on it.
  5422. - virtual void CheckProtectedPasswordEntry(
  5423. - metrics_util::PasswordType reused_password_type,
  5424. - const std::string& username,
  5425. - const std::vector<MatchingReusedCredential>& matching_reused_credentials,
  5426. - bool password_field_exists) = 0;
  5427. -
  5428. - // Records a Chrome Sync event that GAIA password reuse was detected.
  5429. - virtual void LogPasswordReuseDetectedEvent() = 0;
  5430. // If the feature is enabled send an event to the enterprise reporting
  5431. // connector server indicating that the user signed in to a website.
  5432. @@ -441,9 +424,6 @@ class PasswordManagerClient {
  5433. // Returns the favicon service used to retrieve icons for an origin.
  5434. virtual favicon::FaviconService* GetFaviconService();
  5435. - // Returns the identity manager for profile.
  5436. - virtual signin::IdentityManager* GetIdentityManager() = 0;
  5437. -
  5438. // Returns a pointer to the URLLoaderFactory owned by the storage partition of
  5439. // the current profile.
  5440. virtual scoped_refptr<network::SharedURLLoaderFactory>
  5441. diff --git a/components/password_manager/core/browser/password_manager_client_helper.cc b/components/password_manager/core/browser/password_manager_client_helper.cc
  5442. --- a/components/password_manager/core/browser/password_manager_client_helper.cc
  5443. +++ b/components/password_manager/core/browser/password_manager_client_helper.cc
  5444. @@ -13,29 +13,10 @@
  5445. #include "components/password_manager/core/browser/password_sync_util.h"
  5446. #include "components/password_manager/core/common/password_manager_pref_names.h"
  5447. #include "components/prefs/pref_service.h"
  5448. -#include "components/signin/public/identity_manager/account_info.h"
  5449. -#include "components/signin/public/identity_manager/identity_manager.h"
  5450. #include "google_apis/gaia/gaia_auth_util.h"
  5451. namespace password_manager {
  5452. -namespace {
  5453. -
  5454. -constexpr int kMaxMoveToAccountOffersForNonOptedInUser = 5;
  5455. -
  5456. -bool IsPrimaryAccountSignIn(const signin::IdentityManager& identity_manager,
  5457. - const std::u16string& username,
  5458. - const std::string& signon_realm) {
  5459. - CoreAccountInfo primary_account =
  5460. - identity_manager.GetPrimaryAccountInfo(signin::ConsentLevel::kSignin);
  5461. - return sync_util::IsGaiaCredentialPage(signon_realm) &&
  5462. - !primary_account.IsEmpty() &&
  5463. - gaia::AreEmailsSame(base::UTF16ToUTF8(username),
  5464. - primary_account.email);
  5465. -}
  5466. -
  5467. -} // namespace
  5468. -
  5469. PasswordManagerClientHelper::PasswordManagerClientHelper(
  5470. PasswordManagerClient* delegate)
  5471. : delegate_(delegate) {
  5472. @@ -104,29 +85,7 @@ bool PasswordManagerClientHelper::ShouldPromptToEnableAutoSignIn() const {
  5473. bool PasswordManagerClientHelper::ShouldPromptToMovePasswordToAccount(
  5474. const PasswordFormManagerForUI& submitted_manager) const {
  5475. - PasswordFeatureManager* feature_manager =
  5476. - delegate_->GetPasswordFeatureManager();
  5477. - if (!feature_manager->ShouldShowAccountStorageBubbleUi())
  5478. - return false;
  5479. - if (feature_manager->GetDefaultPasswordStore() ==
  5480. - PasswordForm::Store::kProfileStore) {
  5481. - return false;
  5482. - }
  5483. - if (!submitted_manager.IsMovableToAccountStore())
  5484. - return false;
  5485. - if (delegate_->IsIncognito())
  5486. - return false;
  5487. - // It's not useful to store the password for the primary account inside
  5488. - // that same account.
  5489. - if (IsPrimaryAccountSignIn(
  5490. - *delegate_->GetIdentityManager(),
  5491. - submitted_manager.GetPendingCredentials().username_value,
  5492. - submitted_manager.GetPendingCredentials().signon_realm)) {
  5493. - return false;
  5494. - }
  5495. - return feature_manager->IsOptedInForAccountStorage() ||
  5496. - feature_manager->GetMoveOfferedToNonOptedInUserCount() <
  5497. - kMaxMoveToAccountOffersForNonOptedInUser;
  5498. + return false;
  5499. }
  5500. } // namespace password_manager
  5501. diff --git a/components/password_manager/core/browser/sync_credentials_filter.cc b/components/password_manager/core/browser/sync_credentials_filter.cc
  5502. --- a/components/password_manager/core/browser/sync_credentials_filter.cc
  5503. +++ b/components/password_manager/core/browser/sync_credentials_filter.cc
  5504. @@ -10,11 +10,7 @@
  5505. #include "base/metrics/user_metrics.h"
  5506. #include "components/password_manager/core/browser/password_form_manager.h"
  5507. #include "components/password_manager/core/browser/password_manager_util.h"
  5508. -#include "components/password_manager/core/browser/password_sync_util.h"
  5509. #include "components/password_manager/core/common/password_manager_features.h"
  5510. -#include "components/signin/public/identity_manager/account_info.h"
  5511. -#include "components/signin/public/identity_manager/identity_manager.h"
  5512. -#include "google_apis/gaia/gaia_auth_util.h"
  5513. namespace password_manager {
  5514. @@ -34,66 +30,26 @@ bool SyncCredentialsFilter::ShouldSave(const PasswordForm& form) const {
  5515. if (form.form_data.is_gaia_with_skip_save_password_form)
  5516. return false;
  5517. - const syncer::SyncService* sync_service =
  5518. - sync_service_factory_function_.Run();
  5519. - const signin::IdentityManager* identity_manager =
  5520. - client_->GetIdentityManager();
  5521. -
  5522. - if (base::FeatureList::IsEnabled(features::kEnablePasswordsAccountStorage)) {
  5523. - // If kEnablePasswordsAccountStorage is enabled, then don't allow saving the
  5524. - // password if it corresponds to the primary account. Note that if the user
  5525. - // is just signing in to the first Gaia account, then IdentityManager might
  5526. - // not know about the account yet.
  5527. - if (sync_util::IsGaiaCredentialPage(form.signon_realm)) {
  5528. - CoreAccountInfo primary_account = identity_manager->GetPrimaryAccountInfo(
  5529. - signin::ConsentLevel::kSignin);
  5530. - if (primary_account.IsEmpty() ||
  5531. - gaia::AreEmailsSame(base::UTF16ToUTF8(form.username_value),
  5532. - primary_account.email)) {
  5533. - return false;
  5534. - }
  5535. - }
  5536. - } else {
  5537. - // If kEnablePasswordsAccountStorage is NOT enabled, then don't allow saving
  5538. - // the password for the sync account specifically.
  5539. - if (sync_util::IsSyncAccountCredential(form, sync_service,
  5540. - identity_manager)) {
  5541. - return false;
  5542. - }
  5543. - }
  5544. -
  5545. return true;
  5546. }
  5547. bool SyncCredentialsFilter::ShouldSaveGaiaPasswordHash(
  5548. const PasswordForm& form) const {
  5549. - if (base::FeatureList::IsEnabled(features::kPasswordReuseDetectionEnabled)) {
  5550. - return !client_->IsIncognito() &&
  5551. - sync_util::IsGaiaCredentialPage(form.signon_realm);
  5552. - }
  5553. return false;
  5554. }
  5555. bool SyncCredentialsFilter::ShouldSaveEnterprisePasswordHash(
  5556. const PasswordForm& form) const {
  5557. - return !client_->IsIncognito() && sync_util::ShouldSaveEnterprisePasswordHash(
  5558. - form, *client_->GetPrefs());
  5559. + return false;
  5560. }
  5561. bool SyncCredentialsFilter::IsSyncAccountEmail(
  5562. const std::string& username) const {
  5563. - return sync_util::IsSyncAccountEmail(username, client_->GetIdentityManager());
  5564. + return false;
  5565. }
  5566. void SyncCredentialsFilter::ReportFormLoginSuccess(
  5567. const PasswordFormManager& form_manager) const {
  5568. - if (!form_manager.IsNewLogin() &&
  5569. - sync_util::IsSyncAccountCredential(form_manager.GetPendingCredentials(),
  5570. - sync_service_factory_function_.Run(),
  5571. - client_->GetIdentityManager())) {
  5572. - base::RecordAction(base::UserMetricsAction(
  5573. - "PasswordManager_SyncCredentialFilledAndLoginSuccessfull"));
  5574. - }
  5575. }
  5576. } // namespace password_manager
  5577. diff --git a/components/signin/features.gni b/components/signin/features.gni
  5578. --- a/components/signin/features.gni
  5579. +++ b/components/signin/features.gni
  5580. @@ -5,7 +5,7 @@
  5581. import("//build/config/chromeos/ui_mode.gni")
  5582. # Dice is supported on the platform (but not necessarily enabled).
  5583. -enable_dice_support = is_linux || is_mac || is_win || is_fuchsia
  5584. +enable_dice_support = false
  5585. # Mirror is enabled and other account consistency mechanisms are not available.
  5586. -enable_mirror = is_android || is_chromeos || is_ios
  5587. +enable_mirror = false
  5588. 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
  5589. --- a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
  5590. +++ b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
  5591. @@ -130,13 +130,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
  5592. }
  5593. protected boolean hasFeatures(Account account, String[] features) {
  5594. - if (hasGetAccountsPermission()) {
  5595. - try {
  5596. - return mAccountManager.hasFeatures(account, features, null, null).getResult();
  5597. - } catch (AuthenticatorException | IOException | OperationCanceledException e) {
  5598. - Log.e(TAG, "Error while checking features: ", e);
  5599. - }
  5600. - }
  5601. return false;
  5602. }
  5603. @@ -177,25 +170,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
  5604. public void updateCredentials(
  5605. Account account, Activity activity, final Callback<Boolean> callback) {
  5606. ThreadUtils.assertOnUiThread();
  5607. - AccountManagerCallback<Bundle> realCallback = future -> {
  5608. - Bundle bundle = null;
  5609. - try {
  5610. - bundle = future.getResult();
  5611. - } catch (AuthenticatorException | IOException e) {
  5612. - Log.e(TAG, "Error while update credentials: ", e);
  5613. - } catch (OperationCanceledException e) {
  5614. - Log.w(TAG, "Updating credentials was cancelled.");
  5615. - }
  5616. - boolean success =
  5617. - bundle != null && bundle.getString(AccountManager.KEY_ACCOUNT_TYPE) != null;
  5618. if (callback != null) {
  5619. - callback.onResult(success);
  5620. + callback.onResult(false);
  5621. }
  5622. - };
  5623. - // Android 4.4 throws NullPointerException if null is passed
  5624. - Bundle emptyOptions = new Bundle();
  5625. - mAccountManager.updateCredentials(
  5626. - account, "android", emptyOptions, activity, realCallback, null);
  5627. }
  5628. @Nullable
  5629. diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
  5630. --- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
  5631. +++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
  5632. @@ -98,54 +98,8 @@ public class HttpNegotiateAuthenticator {
  5633. @Override
  5634. public void run(AccountManagerFuture<Account[]> future) {
  5635. - Account[] accounts;
  5636. - try {
  5637. - accounts = future.getResult();
  5638. - } catch (OperationCanceledException | AuthenticatorException | IOException e) {
  5639. - Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to retrieve accounts.", e);
  5640. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  5641. - HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
  5642. - return;
  5643. - }
  5644. -
  5645. - if (accounts.length == 0) {
  5646. - Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: No account provided for the kerberos "
  5647. - + "authentication. Please verify the configuration policies and "
  5648. - + "that the CONTACTS runtime permission is granted. ");
  5649. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  5650. - HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
  5651. - null);
  5652. - return;
  5653. - }
  5654. -
  5655. - if (accounts.length > 1) {
  5656. - Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: Found %d accounts eligible for the "
  5657. - + "kerberos authentication. Please fix the configuration by "
  5658. - + "providing a single account.",
  5659. - accounts.length);
  5660. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  5661. - HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
  5662. - null);
  5663. - return;
  5664. - }
  5665. -
  5666. - if (lacksPermission(ContextUtils.getApplicationContext(),
  5667. - "android.permission.USE_CREDENTIALS", true)) {
  5668. - // Protecting the AccountManager#getAuthToken call.
  5669. - // API < 23 Requires the USE_CREDENTIALS permission or throws an exception.
  5670. - // API >= 23 USE_CREDENTIALS permission is removed
  5671. - Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: USE_CREDENTIALS permission not "
  5672. - + "granted. Aborting authentication.");
  5673. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  5674. - HttpNegotiateAuthenticator.this,
  5675. - NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
  5676. - return;
  5677. - }
  5678. - mRequestData.account = accounts[0];
  5679. - mRequestData.accountManager.getAuthToken(mRequestData.account,
  5680. - mRequestData.authTokenType, mRequestData.options, true /* notifyAuthFailure */,
  5681. - new GetTokenCallback(mRequestData),
  5682. - new Handler(ThreadUtils.getUiThreadLooper()));
  5683. + // account-based authentication removed for privacy-violations concerns
  5684. + return;
  5685. }
  5686. }
  5687. @@ -158,42 +112,8 @@ public class HttpNegotiateAuthenticator {
  5688. @Override
  5689. public void run(AccountManagerFuture<Bundle> future) {
  5690. - Bundle result;
  5691. - try {
  5692. - result = future.getResult();
  5693. - } catch (OperationCanceledException | AuthenticatorException | IOException e) {
  5694. - Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to obtain a token.", e);
  5695. - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
  5696. - HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
  5697. - return;
  5698. - }
  5699. -
  5700. - if (result.containsKey(AccountManager.KEY_INTENT)) {
  5701. - final Context appContext = ContextUtils.getApplicationContext();
  5702. -
  5703. - // We wait for a broadcast that should be sent once the user is done interacting
  5704. - // with the notification
  5705. - // TODO(dgn) We currently hang around if the notification is swiped away, until
  5706. - // a LOGIN_ACCOUNTS_CHANGED_ACTION filter is received. It might be for something
  5707. - // unrelated then we would wait again here. Maybe we should limit the number of
  5708. - // retries in some way?
  5709. - BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
  5710. -
  5711. - @Override
  5712. - public void onReceive(Context context, Intent intent) {
  5713. - appContext.unregisterReceiver(this);
  5714. - mRequestData.accountManager.getAuthToken(mRequestData.account,
  5715. - mRequestData.authTokenType, mRequestData.options,
  5716. - true /* notifyAuthFailure */, new GetTokenCallback(mRequestData),
  5717. - null);
  5718. - }
  5719. -
  5720. - };
  5721. - appContext.registerReceiver(broadcastReceiver,
  5722. - new IntentFilter(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION));
  5723. - } else {
  5724. - processResult(result, mRequestData);
  5725. - }
  5726. + // account-based authentication removed for privacy-violations concerns
  5727. + return;
  5728. }
  5729. }
  5730. diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
  5731. --- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
  5732. +++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
  5733. @@ -93,7 +93,6 @@ public class OAuthTokenFetcher {
  5734. /** Begins fetching a token. Should be called on the main thread. */
  5735. public void fetch() {
  5736. - fetchImpl(null);
  5737. }
  5738. /**
  5739. @@ -102,7 +101,6 @@ public class OAuthTokenFetcher {
  5740. * @param expiredToken A previously-fetched token which has expired.
  5741. */
  5742. public void clearAndFetch(String expiredToken) {
  5743. - fetchImpl(expiredToken);
  5744. }
  5745. private void fetchImpl(final String expiredToken) {
  5746. --
  5747. 2.25.1