Remove-binary-blob-integrations.patch 212 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531153215331534153515361537153815391540154115421543154415451546154715481549155015511552155315541555155615571558155915601561156215631564156515661567156815691570157115721573157415751576157715781579158015811582158315841585158615871588158915901591159215931594159515961597159815991600160116021603160416051606160716081609161016111612161316141615161616171618161916201621162216231624162516261627162816291630163116321633163416351636163716381639164016411642164316441645164616471648164916501651165216531654165516561657165816591660166116621663166416651666166716681669167016711672167316741675167616771678167916801681168216831684168516861687168816891690169116921693169416951696169716981699170017011702170317041705170617071708170917101711171217131714171517161717171817191720172117221723172417251726172717281729173017311732173317341735173617371738173917401741174217431744174517461747174817491750175117521753175417551756175717581759176017611762176317641765176617671768176917701771177217731774177517761777177817791780178117821783178417851786178717881789179017911792179317941795179617971798179918001801180218031804180518061807180818091810181118121813181418151816181718181819182018211822182318241825182618271828182918301831183218331834183518361837183818391840184118421843184418451846184718481849185018511852185318541855185618571858185918601861186218631864186518661867186818691870187118721873187418751876187718781879188018811882188318841885188618871888188918901891189218931894189518961897189818991900190119021903190419051906190719081909191019111912191319141915191619171918191919201921192219231924192519261927192819291930193119321933193419351936193719381939194019411942194319441945194619471948194919501951195219531954195519561957195819591960196119621963196419651966196719681969197019711972197319741975197619771978197919801981198219831984198519861987198819891990199119921993199419951996199719981999200020012002200320042005200620072008200920102011201220132014201520162017201820192020202120222023202420252026202720282029203020312032203320342035203620372038203920402041204220432044204520462047204820492050205120522053205420552056205720582059206020612062206320642065206620672068206920702071207220732074207520762077207820792080208120822083208420852086208720882089209020912092209320942095209620972098209921002101210221032104210521062107210821092110211121122113211421152116211721182119212021212122212321242125212621272128212921302131213221332134213521362137213821392140214121422143214421452146214721482149215021512152215321542155215621572158215921602161216221632164216521662167216821692170217121722173217421752176217721782179218021812182218321842185218621872188218921902191219221932194219521962197219821992200220122022203220422052206220722082209221022112212221322142215221622172218221922202221222222232224222522262227222822292230223122322233223422352236223722382239224022412242224322442245224622472248224922502251225222532254225522562257225822592260226122622263226422652266226722682269227022712272227322742275227622772278227922802281228222832284228522862287228822892290229122922293229422952296229722982299230023012302230323042305230623072308230923102311231223132314231523162317231823192320232123222323232423252326232723282329233023312332233323342335233623372338233923402341234223432344234523462347234823492350235123522353235423552356235723582359236023612362236323642365236623672368236923702371237223732374237523762377237823792380238123822383238423852386238723882389239023912392239323942395239623972398239924002401240224032404240524062407240824092410241124122413241424152416241724182419242024212422242324242425242624272428242924302431243224332434243524362437243824392440244124422443244424452446244724482449245024512452245324542455245624572458245924602461246224632464246524662467246824692470247124722473247424752476247724782479248024812482248324842485248624872488248924902491249224932494249524962497249824992500250125022503250425052506250725082509251025112512251325142515251625172518251925202521252225232524252525262527252825292530253125322533253425352536253725382539254025412542254325442545254625472548254925502551255225532554255525562557255825592560256125622563256425652566256725682569257025712572257325742575257625772578257925802581258225832584258525862587258825892590259125922593259425952596259725982599260026012602260326042605260626072608260926102611261226132614261526162617261826192620262126222623262426252626262726282629263026312632263326342635263626372638263926402641264226432644264526462647264826492650265126522653265426552656265726582659266026612662266326642665266626672668266926702671267226732674267526762677267826792680268126822683268426852686268726882689269026912692269326942695269626972698269927002701270227032704270527062707270827092710271127122713271427152716271727182719272027212722272327242725272627272728272927302731273227332734273527362737273827392740274127422743274427452746274727482749275027512752275327542755275627572758275927602761276227632764276527662767276827692770277127722773277427752776277727782779278027812782278327842785278627872788278927902791279227932794279527962797279827992800280128022803280428052806280728082809281028112812281328142815281628172818281928202821282228232824282528262827282828292830283128322833283428352836283728382839284028412842284328442845284628472848284928502851285228532854285528562857285828592860286128622863286428652866286728682869287028712872287328742875287628772878287928802881288228832884288528862887288828892890289128922893289428952896289728982899290029012902290329042905290629072908290929102911291229132914291529162917291829192920292129222923292429252926292729282929293029312932293329342935293629372938293929402941294229432944294529462947294829492950295129522953295429552956295729582959296029612962296329642965296629672968296929702971297229732974297529762977297829792980298129822983298429852986298729882989299029912992299329942995299629972998299930003001300230033004300530063007300830093010301130123013301430153016301730183019302030213022302330243025302630273028302930303031303230333034303530363037303830393040304130423043304430453046304730483049305030513052305330543055305630573058305930603061306230633064306530663067306830693070307130723073307430753076307730783079308030813082308330843085308630873088308930903091309230933094309530963097309830993100310131023103310431053106310731083109311031113112311331143115311631173118311931203121312231233124312531263127312831293130313131323133313431353136313731383139314031413142314331443145314631473148314931503151315231533154315531563157315831593160316131623163316431653166316731683169317031713172317331743175317631773178317931803181318231833184318531863187318831893190319131923193319431953196319731983199320032013202320332043205320632073208320932103211321232133214321532163217321832193220322132223223322432253226322732283229323032313232323332343235323632373238323932403241324232433244324532463247324832493250325132523253325432553256325732583259326032613262326332643265326632673268326932703271327232733274327532763277327832793280328132823283328432853286328732883289329032913292329332943295329632973298329933003301330233033304330533063307330833093310331133123313331433153316331733183319332033213322332333243325332633273328332933303331333233333334333533363337333833393340334133423343334433453346334733483349335033513352335333543355335633573358335933603361336233633364336533663367336833693370337133723373337433753376337733783379338033813382338333843385338633873388338933903391339233933394339533963397339833993400340134023403340434053406340734083409341034113412341334143415341634173418341934203421342234233424342534263427342834293430343134323433343434353436343734383439344034413442344334443445344634473448344934503451345234533454345534563457345834593460346134623463346434653466346734683469347034713472347334743475347634773478347934803481348234833484348534863487348834893490349134923493349434953496349734983499350035013502350335043505350635073508350935103511351235133514351535163517351835193520352135223523352435253526352735283529353035313532353335343535353635373538353935403541354235433544354535463547354835493550355135523553355435553556355735583559356035613562356335643565356635673568356935703571357235733574357535763577357835793580358135823583358435853586358735883589359035913592359335943595359635973598359936003601360236033604360536063607360836093610361136123613361436153616361736183619362036213622362336243625362636273628362936303631363236333634363536363637363836393640364136423643364436453646364736483649365036513652365336543655365636573658365936603661366236633664366536663667366836693670367136723673367436753676367736783679368036813682368336843685368636873688368936903691369236933694369536963697369836993700370137023703370437053706370737083709371037113712371337143715371637173718371937203721372237233724372537263727372837293730373137323733373437353736373737383739374037413742374337443745374637473748374937503751375237533754375537563757375837593760376137623763376437653766376737683769377037713772377337743775377637773778377937803781378237833784378537863787378837893790379137923793379437953796379737983799380038013802380338043805380638073808380938103811381238133814381538163817381838193820382138223823382438253826382738283829383038313832383338343835383638373838383938403841384238433844384538463847384838493850385138523853385438553856385738583859386038613862386338643865386638673868386938703871387238733874387538763877387838793880388138823883388438853886388738883889389038913892389338943895389638973898389939003901390239033904390539063907390839093910391139123913391439153916391739183919392039213922392339243925392639273928392939303931393239333934393539363937393839393940394139423943394439453946394739483949395039513952395339543955395639573958395939603961396239633964396539663967396839693970397139723973397439753976397739783979398039813982398339843985398639873988398939903991399239933994399539963997399839994000400140024003400440054006400740084009401040114012401340144015401640174018401940204021402240234024402540264027402840294030403140324033403440354036403740384039404040414042404340444045404640474048404940504051405240534054405540564057405840594060406140624063406440654066406740684069407040714072407340744075407640774078407940804081408240834084408540864087408840894090409140924093409440954096409740984099410041014102410341044105410641074108410941104111411241134114411541164117411841194120412141224123412441254126412741284129413041314132413341344135413641374138413941404141414241434144414541464147414841494150415141524153415441554156415741584159416041614162416341644165416641674168416941704171417241734174417541764177417841794180418141824183418441854186418741884189419041914192419341944195419641974198419942004201420242034204420542064207420842094210421142124213421442154216421742184219422042214222422342244225422642274228422942304231423242334234423542364237423842394240424142424243424442454246424742484249425042514252425342544255425642574258425942604261426242634264426542664267426842694270427142724273427442754276427742784279428042814282428342844285428642874288428942904291429242934294429542964297429842994300430143024303430443054306430743084309431043114312431343144315431643174318431943204321432243234324432543264327432843294330433143324333433443354336433743384339434043414342434343444345434643474348434943504351435243534354435543564357435843594360436143624363436443654366436743684369437043714372437343744375437643774378437943804381438243834384438543864387438843894390439143924393439443954396439743984399440044014402440344044405440644074408440944104411441244134414441544164417441844194420442144224423442444254426442744284429443044314432443344344435443644374438443944404441444244434444444544464447444844494450445144524453445444554456445744584459446044614462446344644465446644674468446944704471447244734474447544764477447844794480448144824483448444854486448744884489449044914492449344944495449644974498449945004501450245034504450545064507450845094510451145124513451445154516451745184519452045214522452345244525452645274528452945304531453245334534453545364537453845394540454145424543454445454546454745484549455045514552455345544555455645574558455945604561456245634564456545664567456845694570457145724573457445754576457745784579458045814582458345844585458645874588458945904591459245934594459545964597459845994600460146024603460446054606460746084609461046114612461346144615461646174618461946204621462246234624462546264627462846294630463146324633463446354636463746384639464046414642464346444645464646474648464946504651465246534654
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Mon, 5 Apr 2021 21:37:12 +0200
  3. Subject: Remove binary blob integrations
  4. Remove dependency on com.google.android.gms.auth
  5. kill GCM
  6. Remove dependency on com.google.android.gcm
  7. Remove dependency on com.google.android.gms.gcm
  8. It also disables Snippets, auto-update of offline pages and launching browser from background service.
  9. The snippets are already disabled in native codes, this will disable it on Java level.
  10. Remove dependency on com.google.android.play
  11. Remove dependency on vision, clearcut and phenotype
  12. Remove dependency on flags, places and stats
  13. Remove dependency on fido, iid, instantapps, location
  14. Remove dependency on com.google.android.gms.cast
  15. Remove dependency on auth, signin, dynamic and tasks
  16. Remove google_services_gcm
  17. ungoogled-chromium: Disable GCM
  18. Disable Google Cloud Messaging (GCM) client
  19. Parts of this patch were developed by csagan5, uazo and others.
  20. ---
  21. ...em_webview_bundle.AndroidManifest.expected | 5 -
  22. chrome/android/BUILD.gn | 37 --
  23. chrome/android/chrome_java_sources.gni | 5 -
  24. chrome/android/java/AndroidManifest.xml | 68 ---
  25. .../org/chromium/chrome/browser/AppHooks.java | 14 +-
  26. .../browser/PlayServicesVersionInfo.java | 12 +-
  27. .../ChromeBackgroundTaskFactory.java | 3 -
  28. .../ExternalNavigationDelegateImpl.java | 8 +-
  29. .../gcore/ChromeGoogleApiClientImpl.java | 25 +-
  30. .../browser/gcore/GoogleApiClientHelper.java | 82 +--
  31. .../instantapps/InstantAppsHandler.java | 57 +-
  32. .../browser/omaha/UpdateStatusProvider.java | 10 +-
  33. .../inline/FakeAppUpdateManagerWrapper.java | 60 +-
  34. .../inline/InlineUpdateControllerFactory.java | 16 -
  35. .../inline/PlayInlineUpdateController.java | 226 +-------
  36. .../modules/chrome_feature_modules.gni | 3 -
  37. chrome/browser/BUILD.gn | 2 -
  38. chrome/browser/language/android/BUILD.gn | 2 -
  39. .../language/AppLanguagePromoDialog.java | 13 -
  40. .../AppLanguagePreferenceDelegate.java | 8 -
  41. .../language/settings/LanguageSettings.java | 6 -
  42. .../prefetch/prefetch_service_factory.cc | 16 -
  43. .../push_messaging_service_factory.cc | 8 +-
  44. chrome/browser/ui/BUILD.gn | 3 -
  45. .../webui/chrome_web_ui_controller_factory.cc | 3 -
  46. chrome/test/android/BUILD.gn | 2 -
  47. components/background_task_scheduler/BUILD.gn | 5 -
  48. .../internal/BUILD.gn | 10 -
  49. .../BackgroundTaskGcmTaskService.java | 160 ------
  50. ...ackgroundTaskSchedulerFactoryInternal.java | 6 +-
  51. ...kgroundTaskSchedulerGcmNetworkManager.java | 257 ---------
  52. .../component_updater/UpdateScheduler.java | 1 -
  53. components/externalauth/android/BUILD.gn | 3 -
  54. .../externalauth/ExternalAuthUtils.java | 18 +-
  55. .../UserRecoverableErrorHandler.java | 7 -
  56. components/gcm_driver/gcm_client_impl.cc | 4 +
  57. .../gcm_driver/instance_id/android/BUILD.gn | 3 -
  58. .../instance_id/InstanceIDBridge.java | 47 +-
  59. .../media_router/browser/android/BUILD.gn | 9 -
  60. .../media_router/BrowserMediaRouter.java | 18 +-
  61. .../media_router/CastSessionUtil.java | 35 --
  62. .../components/media_router/MediaSink.java | 44 +-
  63. .../media_router/MediaStatusBridge.java | 40 +-
  64. .../caf/BaseNotificationController.java | 52 --
  65. .../caf/BaseSessionController.java | 100 +---
  66. .../caf/CafBaseMediaRouteProvider.java | 114 +---
  67. .../caf/CafMediaRouteProvider.java | 16 -
  68. .../media_router/caf/CafMessageHandler.java | 97 +---
  69. .../media_router/caf/CastMediaSource.java | 10 +-
  70. .../media_router/caf/CastOptionsProvider.java | 22 +-
  71. .../caf/CastSessionController.java | 84 ---
  72. .../media_router/caf/CastUtils.java | 8 -
  73. .../CafExpandedControllerActivity.java | 41 +-
  74. .../CafRemotingMediaRouteProvider.java | 5 +-
  75. .../remoting/FlingingControllerAdapter.java | 74 ---
  76. .../caf/remoting/RemotingMediaSource.java | 8 +-
  77. .../remoting/RemotingSessionController.java | 26 -
  78. .../test/android/cast_emulator/BUILD.gn | 1 -
  79. components/module_installer/android/BUILD.gn | 2 -
  80. components/signin/public/android/BUILD.gn | 4 -
  81. components/webauthn/android/BUILD.gn | 5 -
  82. .../webauthn/AuthenticatorImpl.java | 31 +-
  83. .../push_messaging/push_messaging_manager.cc | 2 +-
  84. content/public/android/BUILD.gn | 4 -
  85. content/public/common/content_features.cc | 2 +-
  86. content/test/BUILD.gn | 4 -
  87. device/BUILD.gn | 3 -
  88. remoting/android/client_java_tmpl.gni | 3 -
  89. services/BUILD.gn | 9 -
  90. services/device/geolocation/BUILD.gn | 3 -
  91. services/shape_detection/BUILD.gn | 4 -
  92. third_party/android_deps/BUILD.gn | 540 +-----------------
  93. .../preconditions/javatests/BUILD.gn | 1 -
  94. .../gms/ChromiumPlayServicesAvailability.java | 10 +-
  95. 74 files changed, 66 insertions(+), 2580 deletions(-)
  96. delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java
  97. delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java
  98. diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
  99. --- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
  100. +++ b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
  101. @@ -18,10 +18,6 @@
  102. android:label="Android System WebView"
  103. android:multiArch="true"
  104. android:use32bitAbi="true">
  105. - <activity # DIFF-ANCHOR: ea1a94af
  106. - android:name="com.google.android.gms.common.api.GoogleApiActivity"
  107. - android:exported="false"
  108. - android:theme="@android:style/Theme.Translucent.NoTitleBar">
  109. </activity> # DIFF-ANCHOR: ea1a94af
  110. <activity # DIFF-ANCHOR: a4438884
  111. android:name="org.chromium.android_webview.devui.MainActivity"
  112. @@ -65,7 +61,6 @@
  113. android:visibleToInstantApps="true">
  114. </activity-alias> # DIFF-ANCHOR: b7cc06e9
  115. <meta-data android:name="$PACKAGE.WebViewLibrary" android:value="libwebviewchromium.so"/>
  116. - <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
  117. <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES" android:value="0"/>
  118. <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
  119. <provider # DIFF-ANCHOR: a5e78e63
  120. diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
  121. --- a/chrome/android/BUILD.gn
  122. +++ b/chrome/android/BUILD.gn
  123. @@ -304,20 +304,10 @@ android_library("chrome_java") {
  124. ":chrome_public_apk_template_resources",
  125. ":update_proto_java",
  126. ":usage_stats_proto_java",
  127. - "$google_play_services_package:google_play_services_auth_base_java",
  128. - "$google_play_services_package:google_play_services_base_java",
  129. - "$google_play_services_package:google_play_services_basement_java",
  130. - "$google_play_services_package:google_play_services_cast_framework_java",
  131. - "$google_play_services_package:google_play_services_cast_java",
  132. - "$google_play_services_package:google_play_services_fido_java",
  133. - "$google_play_services_package:google_play_services_gcm_java",
  134. - "$google_play_services_package:google_play_services_iid_java",
  135. - "$google_play_services_package:google_play_services_tasks_java",
  136. "//base:base_java",
  137. "//cc:cc_java",
  138. "//chrome/android/features/keyboard_accessory:public_java",
  139. "//chrome/android/features/start_surface:public_java",
  140. - "//chrome/android/modules/cablev2_authenticator/public:java",
  141. "//chrome/android/modules/image_editor/provider:java",
  142. "//chrome/android/modules/stack_unwinder/provider:java",
  143. "//chrome/android/webapk/libs/client:client_java",
  144. @@ -571,7 +561,6 @@ android_library("chrome_java") {
  145. "//third_party/android_data_chart:android_data_chart_java",
  146. "//third_party/android_deps:android_support_v7_appcompat_java",
  147. "//third_party/android_deps:chromium_play_services_availability_java",
  148. - "//third_party/android_deps:com_google_android_play_core_java",
  149. "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
  150. "//third_party/android_deps:com_google_guava_listenablefuture_java",
  151. "//third_party/android_deps:dagger_java",
  152. @@ -894,11 +883,6 @@ junit_binary("chrome_junit_tests") {
  153. ":chrome_java",
  154. ":chrome_public_android_manifest",
  155. ":delegate_public_impl_java",
  156. - "$google_play_services_package:google_play_services_base_java",
  157. - "$google_play_services_package:google_play_services_basement_java",
  158. - "$google_play_services_package:google_play_services_cast_framework_java",
  159. - "$google_play_services_package:google_play_services_cast_java",
  160. - "$google_play_services_package:google_play_services_fido_java",
  161. "//base:base_java",
  162. "//base:base_java_test_support",
  163. "//base:base_junit_test_support",
  164. @@ -1260,14 +1244,6 @@ android_library("chrome_test_java") {
  165. ":chrome_test_util_java",
  166. ":chrome_test_util_jni",
  167. ":delegate_public_impl_java",
  168. - "$google_play_services_package:google_play_services_base_java",
  169. - "$google_play_services_package:google_play_services_basement_java",
  170. - "$google_play_services_package:google_play_services_cast_framework_java",
  171. - "$google_play_services_package:google_play_services_cast_java",
  172. - "$google_play_services_package:google_play_services_fido_java",
  173. - "$google_play_services_package:google_play_services_gcm_java",
  174. - "$google_play_services_package:google_play_services_iid_java",
  175. - "$google_play_services_package:google_play_services_tasks_java",
  176. "//base:base_java",
  177. "//base:base_java_test_support",
  178. "//base/test:test_support_java",
  179. @@ -2314,7 +2290,6 @@ android_library("browser_java_test_support") {
  180. ]
  181. deps = [
  182. ":chrome_java",
  183. - "$google_play_services_package:google_play_services_gcm_java",
  184. "//base:base_java",
  185. "//base:base_java_test_support",
  186. "//base:jni_java",
  187. @@ -2459,9 +2434,7 @@ android_library("base_monochrome_module_java") {
  188. android_library("base_module_java") {
  189. sources = [
  190. "../browser/attribution_reporting/android/java/src/org/chromium/chrome/browser/attribution_reporting/AttributionReportingProvider.java",
  191. - "java/src/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java",
  192. "java/src/org/chromium/chrome/app/TrichromeZygotePreload.java",
  193. - "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
  194. "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
  195. "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java",
  196. "java/src/org/chromium/chrome/browser/base/DexFixer.java",
  197. @@ -2472,8 +2445,6 @@ android_library("base_module_java") {
  198. "java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
  199. "java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
  200. "java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
  201. - "java/src/org/chromium/chrome/browser/base/SplitCompatGcmListenerService.java",
  202. - "java/src/org/chromium/chrome/browser/base/SplitCompatGcmTaskService.java",
  203. "java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
  204. "java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
  205. "java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
  206. @@ -2500,16 +2471,10 @@ android_library("base_module_java") {
  207. "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
  208. "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
  209. "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
  210. - "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java",
  211. - "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundService.java",
  212. - "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
  213. "java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java",
  214. ]
  215. deps = [
  216. ":chrome_base_module_resources",
  217. - "$google_play_services_package:google_firebase_firebase_iid_java",
  218. - "$google_play_services_package:google_firebase_firebase_messaging_java",
  219. - "$google_play_services_package:google_play_services_gcm_java",
  220. "//base:base_java",
  221. "//chrome/browser/download/android:file_provider_java",
  222. "//chrome/browser/flags:java",
  223. @@ -2522,7 +2487,6 @@ android_library("base_module_java") {
  224. "//components/media_router/browser/android:cast_options_provider_java",
  225. "//components/minidump_uploader:minidump_uploader_java",
  226. "//components/module_installer/android:module_installer_java",
  227. - "//third_party/android_deps:com_google_android_play_core_java",
  228. "//third_party/androidx:androidx_annotation_annotation_java",
  229. "//third_party/androidx:androidx_collection_collection_java",
  230. "//third_party/androidx:androidx_fragment_fragment_java",
  231. @@ -2544,7 +2508,6 @@ android_library("base_module_java") {
  232. # Deps to pull services into base module.
  233. # TODO(crbug.com/1126301): Consider moving these to the chrome module to
  234. # reduce base dex size.
  235. - "$google_play_services_package:google_play_services_cast_framework_java",
  236. "//components/background_task_scheduler:background_task_scheduler_java",
  237. "//components/payments/content/android:service_java",
  238. "//third_party/androidx:androidx_browser_browser_java",
  239. diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
  240. --- a/chrome/android/chrome_java_sources.gni
  241. +++ b/chrome/android/chrome_java_sources.gni
  242. @@ -16,7 +16,6 @@ chrome_java_sources = [
  243. "java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java",
  244. "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
  245. "java/src/org/chromium/chrome/browser/ChromeApplicationImpl.java",
  246. - "java/src/org/chromium/chrome/browser/ChromeBackgroundServiceImpl.java",
  247. "java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
  248. "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
  249. "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
  250. @@ -1025,10 +1024,6 @@ chrome_java_sources = [
  251. "java/src/org/chromium/chrome/browser/searchwidget/SearchType.java",
  252. "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
  253. "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivity.java",
  254. - "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerServiceImpl.java",
  255. - "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundServiceImpl.java",
  256. - "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java",
  257. - "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
  258. "java/src/org/chromium/chrome/browser/settings/MainSettings.java",
  259. "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
  260. "java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java",
  261. diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
  262. --- a/chrome/android/java/AndroidManifest.xml
  263. +++ b/chrome/android/java/AndroidManifest.xml
  264. @@ -100,21 +100,16 @@ by a child template that "extends" this file.
  265. <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
  266. <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
  267. <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
  268. - <!-- Only chrome can receive the messages and registration result -->
  269. - <permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE"
  270. - android:protectionLevel="signature" />
  271. <permission android:name="{{ manifest_package }}.permission.DEBUG"
  272. android:label="Debug web pages"
  273. android:protectionLevel="signature" />
  274. <permission android:name="{{ manifest_package }}.permission.TRANSLATE"
  275. android:protectionLevel="signature" />
  276. - <uses-permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE" />
  277. <uses-permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" />
  278. <uses-permission android:name="{{ manifest_package }}.TOS_ACKED" />
  279. <uses-permission android:name="com.chrome.permission.DEVICE_EXTRAS" />
  280. - <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
  281. <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  282. {% block extra_uses_permissions %}
  283. @@ -752,16 +747,6 @@ by a child template that "extends" this file.
  284. </intent-filter>
  285. </activity>
  286. - <activity android:name="org.chromium.components.media_router.caf.remoting.CafExpandedControllerActivity"
  287. - android:theme="@style/Theme.Chromium.Activity"
  288. - android:label="Chrome.CafExpandedControllerActivity"
  289. - android:hardwareAccelerated="true"
  290. - android:launchMode="singleTask"
  291. - android:noHistory="true"
  292. - android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
  293. - android:excludeFromRecents="true">
  294. - </activity>
  295. -
  296. <!-- This activity is used to restart the main Chrome process. Should never be exported. -->
  297. <activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
  298. android:launchMode="singleInstance"
  299. @@ -825,15 +810,6 @@ by a child template that "extends" this file.
  300. </intent-filter>
  301. </activity>
  302. - <!-- Activity for dispatching intents to Instant Apps. -->
  303. - <activity
  304. - android:name="org.chromium.chrome.browser.instantapps.AuthenticatedProxyActivity"
  305. - android:exported="false"
  306. - android:theme="@android:style/Theme.NoDisplay"
  307. - android:noHistory="true"
  308. - android:excludeFromRecents="true">
  309. - </activity>
  310. -
  311. <activity
  312. android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
  313. android:exported="false"
  314. @@ -1002,26 +978,6 @@ by a child template that "extends" this file.
  315. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
  316. android:hardwareAccelerated="false" />
  317. - <!-- GcmTaskService for registration for Invalidations. Not actually implemented anymore. -->
  318. - <service android:name="com.google.ipc.invalidation.ticl.android2.channel.GcmRegistrationTaskService"
  319. - android:exported="true"
  320. - android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
  321. - <intent-filter>
  322. - <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY"/>
  323. - </intent-filter>
  324. - </service>
  325. - <!-- GcmListenerService for messages from GCM. -->
  326. - <service android:name="org.chromium.chrome.browser.services.gcm.ChromeGcmListenerService"
  327. - android:exported="false" >
  328. - <intent-filter>
  329. - <action android:name="com.google.firebase.MESSAGING_EVENT" />
  330. - </intent-filter>
  331. - </service>
  332. - <service android:name="org.chromium.chrome.browser.services.gcm.GCMBackgroundService"
  333. - android:exported="false"/>
  334. - <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
  335. - android:exported="false"/>
  336. -
  337. <!-- Android Notification service listener -->
  338. <service android:name="org.chromium.chrome.browser.notifications.NotificationService"
  339. android:exported="false"/>
  340. @@ -1045,28 +1001,10 @@ by a child template that "extends" this file.
  341. android:exported="false"
  342. android:permission="android.permission.BIND_JOB_SERVICE"/>
  343. - <!-- Background Task Scheduler GCM task service -->
  344. - <service android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskGcmTaskService"
  345. - android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
  346. - android:exported="true">
  347. - <intent-filter>
  348. - <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
  349. - </intent-filter>
  350. - </service>
  351. -
  352. <!-- Background Task Scheduler alarm receiver -->
  353. <receiver android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskBroadcastReceiver"
  354. android:exported="false" />
  355. - <!-- GcmTaskService implementation to wake Chrome on scheduled events -->
  356. - <service android:name="org.chromium.chrome.browser.ChromeBackgroundService"
  357. - android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
  358. - android:exported="true">
  359. - <intent-filter>
  360. - <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
  361. - </intent-filter>
  362. - </service>
  363. -
  364. <service android:name="org.chromium.chrome.browser.prerender.ChromePrerenderService"
  365. android:exported="true"
  366. tools:ignore="ExportedService" />
  367. @@ -1276,12 +1214,6 @@ by a child template that "extends" this file.
  368. <meta-data android:name="com.google.ar.core" android:value="optional" />
  369. {% endif %}
  370. - <!-- Cast support -->
  371. - <meta-data
  372. - android:name=
  373. - "com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
  374. - android:value="org.chromium.components.media_router.caf.CastOptionsProvider"/>
  375. -
  376. <!-- These providers are declared in the base module to give the chrome
  377. split preloader more time to work. -->
  378. <provider android:name="org.chromium.chrome.browser.util.ChromeFileProvider"
  379. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  380. --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  381. +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
  382. @@ -10,9 +10,6 @@ import android.content.pm.PackageManager;
  383. import androidx.annotation.Nullable;
  384. import androidx.annotation.VisibleForTesting;
  385. -import com.google.android.gms.common.ConnectionResult;
  386. -import com.google.android.gms.common.GoogleApiAvailability;
  387. -
  388. import org.chromium.base.ContextUtils;
  389. import org.chromium.base.annotations.CalledByNative;
  390. import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
  391. @@ -275,16 +272,7 @@ public abstract class AppHooks {
  392. * same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}.
  393. */
  394. public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) {
  395. - try {
  396. - PackageInfo gmsPackageInfo =
  397. - ContextUtils.getApplicationContext().getPackageManager().getPackageInfo(
  398. - GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, /* flags= */ 0);
  399. - int apkVersion = gmsPackageInfo.versionCode;
  400. - if (apkVersion >= minApkVersion) return ConnectionResult.SUCCESS;
  401. - } catch (PackageManager.NameNotFoundException e) {
  402. - return ConnectionResult.SERVICE_MISSING;
  403. - }
  404. - return ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED;
  405. + return 1; /* SERVICE_MISSING*/
  406. }
  407. /**
  408. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java
  409. --- a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java
  410. +++ b/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java
  411. @@ -7,8 +7,6 @@ package org.chromium.chrome.browser;
  412. import android.content.Context;
  413. import android.content.pm.PackageManager;
  414. -import com.google.android.gms.common.GoogleApiAvailability;
  415. -
  416. import org.chromium.base.ContextUtils;
  417. import org.chromium.base.annotations.CalledByNative;
  418. import org.chromium.components.externalauth.ExternalAuthUtils;
  419. @@ -29,7 +27,7 @@ public class PlayServicesVersionInfo {
  420. public static String getGmsInfo() {
  421. Context context = ContextUtils.getApplicationContext();
  422. - final long sdkVersion = GoogleApiAvailability.GOOGLE_PLAY_SERVICES_VERSION_CODE;
  423. + final long sdkVersion = 12600000;
  424. final long installedGmsVersion = getApkVersionNumber(context);
  425. final String accessType;
  426. @@ -53,12 +51,6 @@ public class PlayServicesVersionInfo {
  427. * package is not found.
  428. */
  429. public static int getApkVersionNumber(Context context) {
  430. - try {
  431. - return context.getPackageManager()
  432. - .getPackageInfo(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, 0)
  433. - .versionCode;
  434. - } catch (PackageManager.NameNotFoundException e) {
  435. - return 0;
  436. - }
  437. + return 0;
  438. }
  439. }
  440. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
  441. --- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
  442. +++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
  443. @@ -17,7 +17,6 @@ import org.chromium.chrome.browser.offlinepages.OfflineBackgroundTask;
  444. import org.chromium.chrome.browser.offlinepages.measurements.OfflineMeasurementsBackgroundTask;
  445. import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchBackgroundTask;
  446. import org.chromium.chrome.browser.omaha.OmahaService;
  447. -import org.chromium.chrome.browser.services.gcm.GCMBackgroundTask;
  448. import org.chromium.chrome.browser.webapps.WebApkUpdateTask;
  449. import org.chromium.components.background_task_scheduler.BackgroundTask;
  450. import org.chromium.components.background_task_scheduler.BackgroundTaskFactory;
  451. @@ -58,8 +57,6 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory {
  452. switch (taskId) {
  453. case TaskIds.OMAHA_JOB_ID:
  454. return new OmahaService();
  455. - case TaskIds.GCM_BACKGROUND_TASK_JOB_ID:
  456. - return new GCMBackgroundTask();
  457. case TaskIds.OFFLINE_PAGES_BACKGROUND_JOB_ID:
  458. return new OfflineBackgroundTask();
  459. case TaskIds.OFFLINE_PAGES_PREFETCH_JOB_ID:
  460. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
  461. --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
  462. +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
  463. @@ -204,12 +204,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
  464. @Override
  465. public void maybeAdjustInstantAppExtras(Intent intent, boolean isIntentToInstantApp) {
  466. - if (isIntentToInstantApp) {
  467. - intent.putExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER, true);
  468. - } else {
  469. - // Make sure this extra is not sent unless we've done the verification.
  470. - intent.removeExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER);
  471. - }
  472. + // Always remove this extra
  473. + intent.removeExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER);
  474. }
  475. @Override
  476. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java
  477. --- a/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java
  478. +++ b/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java
  479. @@ -6,9 +6,6 @@ package org.chromium.chrome.browser.gcore;
  480. import android.content.Context;
  481. -import com.google.android.gms.common.ConnectionResult;
  482. -import com.google.android.gms.common.api.GoogleApiClient;
  483. -
  484. import org.chromium.base.Log;
  485. import org.chromium.base.TraceEvent;
  486. import org.chromium.components.externalauth.ExternalAuthUtils;
  487. @@ -22,7 +19,6 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
  488. private static final String TAG = "Icing";
  489. private final Context mApplicationContext;
  490. - private final GoogleApiClient mClient;
  491. private final ExternalAuthUtils mExternalAuthUtils;
  492. /**
  493. @@ -32,10 +28,9 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
  494. * @param requireFirstPartyBuild true if the given client can only be used in a first-party
  495. * build.
  496. */
  497. - public ChromeGoogleApiClientImpl(Context context, GoogleApiClient client,
  498. + public ChromeGoogleApiClientImpl(Context context,
  499. boolean requireFirstPartyBuild) {
  500. mApplicationContext = context.getApplicationContext();
  501. - mClient = client;
  502. mExternalAuthUtils = ExternalAuthUtils.getInstance();
  503. if (requireFirstPartyBuild && !mExternalAuthUtils.isChromeGoogleSigned()) {
  504. throw new IllegalStateException("GoogleApiClient requires first-party build");
  505. @@ -44,7 +39,6 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
  506. @Override
  507. public void disconnect() {
  508. - mClient.disconnect();
  509. }
  510. @Override
  511. @@ -60,24 +54,11 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
  512. @Override
  513. public boolean connectWithTimeout(long timeout) {
  514. TraceEvent.begin("ChromeGoogleApiClientImpl:connectWithTimeout");
  515. - try {
  516. - ConnectionResult result = mClient.blockingConnect(timeout, TimeUnit.MILLISECONDS);
  517. - if (!result.isSuccess()) {
  518. - Log.e(TAG, "Connection to GmsCore unsuccessful. Error %d", result.getErrorCode());
  519. - } else {
  520. - Log.d(TAG, "Connection to GmsCore successful.");
  521. - }
  522. - return result.isSuccess();
  523. - } finally {
  524. - TraceEvent.end("ChromeGoogleApiClientImpl:connectWithTimeout");
  525. - }
  526. + TraceEvent.end("ChromeGoogleApiClientImpl:connectWithTimeout");
  527. + return false;
  528. }
  529. public Context getApplicationContext() {
  530. return mApplicationContext;
  531. }
  532. -
  533. - public GoogleApiClient getApiClient() {
  534. - return mClient;
  535. - }
  536. }
  537. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java
  538. --- a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java
  539. +++ b/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java
  540. @@ -7,11 +7,6 @@ package org.chromium.chrome.browser.gcore;
  541. import android.os.Bundle;
  542. import android.os.Handler;
  543. -import com.google.android.gms.common.ConnectionResult;
  544. -import com.google.android.gms.common.api.GoogleApiClient;
  545. -import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
  546. -import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
  547. -
  548. import org.chromium.base.ApplicationStatus;
  549. import org.chromium.base.ApplicationStatus.ApplicationStateListener;
  550. import org.chromium.base.Log;
  551. @@ -67,29 +62,15 @@ import org.chromium.base.ThreadUtils;
  552. * }
  553. * </pre>
  554. */
  555. -public class GoogleApiClientHelper
  556. - implements OnConnectionFailedListener, ConnectionCallbacks {
  557. +public class GoogleApiClientHelper {
  558. private static final String TAG = "GCore";
  559. private int mResolutionAttempts;
  560. private boolean mWasConnectedBefore;
  561. private final Handler mHandler = new Handler(ThreadUtils.getUiThreadLooper());
  562. - private final GoogleApiClient mClient;
  563. private long mDisconnectionDelayMs;
  564. private Runnable mPendingDisconnect;
  565. - /**
  566. - * Creates a helper and enrolls it in the various connection management features.
  567. - * See the class documentation for {@link GoogleApiClientHelper} for more information.
  568. - *
  569. - * @param client The client to wrap.
  570. - */
  571. - public GoogleApiClientHelper(GoogleApiClient client) {
  572. - mClient = client;
  573. - enableConnectionRetrying(true);
  574. - enableLifecycleManagement(true);
  575. - }
  576. -
  577. /**
  578. * Opts in or out of lifecycle management. The client's connection will be closed and reopened
  579. * when Chrome goes in and out of background.
  580. @@ -116,13 +97,6 @@ public class GoogleApiClientHelper
  581. * Enabling or disabling it while it is already enabled or disabled has no effect.
  582. */
  583. public void enableConnectionRetrying(boolean enabled) {
  584. - if (enabled) {
  585. - mClient.registerConnectionCallbacks(this);
  586. - mClient.registerConnectionFailedListener(this);
  587. - } else {
  588. - mClient.unregisterConnectionCallbacks(this);
  589. - mClient.unregisterConnectionFailedListener(this);
  590. - }
  591. }
  592. /**
  593. @@ -155,21 +129,11 @@ public class GoogleApiClientHelper
  594. // Cancel and reschedule the disconnection if we are in the background. We do it early to
  595. // avoid race conditions between a disconnect on the UI thread and the connect below.
  596. if (!ApplicationStatus.hasVisibleActivities()) scheduleDisconnection();
  597. -
  598. - // The client might be disconnected if we were idle in the background for too long.
  599. - if (!mClient.isConnected() && !mClient.isConnecting()) {
  600. - Log.d(TAG, "Reconnecting the client.");
  601. - mClient.connect();
  602. - }
  603. }
  604. void restoreConnectedState() {
  605. // If we go back to the foreground before a delayed disconnect happens, cancel it.
  606. cancelPendingDisconnection();
  607. -
  608. - if (mWasConnectedBefore) {
  609. - mClient.connect();
  610. - }
  611. }
  612. /**
  613. @@ -192,12 +156,6 @@ public class GoogleApiClientHelper
  614. }
  615. private void disconnect() {
  616. - if (mClient.isConnected() || mClient.isConnecting()) {
  617. - mWasConnectedBefore = true;
  618. - }
  619. -
  620. - // We always call disconnect to abort possibly pending connection requests.
  621. - mClient.disconnect();
  622. }
  623. private void cancelPendingDisconnection() {
  624. @@ -207,43 +165,7 @@ public class GoogleApiClientHelper
  625. mPendingDisconnect = null;
  626. }
  627. - @Override
  628. - public void onConnectionFailed(ConnectionResult result) {
  629. - if (!isErrorRecoverableByRetrying(result.getErrorCode())) {
  630. - Log.d(TAG, "Not retrying managed client connection. Unrecoverable error: %d",
  631. - result.getErrorCode());
  632. - return;
  633. - }
  634. -
  635. - if (mResolutionAttempts < ConnectedTask.RETRY_NUMBER_LIMIT) {
  636. - Log.d(TAG, "Retrying managed client connection. attempt %d/%d - errorCode: %d",
  637. - mResolutionAttempts, ConnectedTask.RETRY_NUMBER_LIMIT, result.getErrorCode());
  638. - mResolutionAttempts += 1;
  639. -
  640. - mHandler.postDelayed(new Runnable() {
  641. - @Override
  642. - public void run() {
  643. - mClient.connect();
  644. - }
  645. - }, ConnectedTask.CONNECTION_RETRY_TIME_MS);
  646. - }
  647. - }
  648. -
  649. - @Override
  650. - public void onConnected(Bundle connectionHint) {
  651. - mResolutionAttempts = 0;
  652. - }
  653. -
  654. - @Override
  655. - public void onConnectionSuspended(int cause) {
  656. - // GoogleApiClient handles retrying on suspension itself. Logging in case it didn't succeed
  657. - // for some reason.
  658. - Log.w(TAG, "Managed client connection suspended. Cause: %d", cause);
  659. - }
  660. -
  661. private static boolean isErrorRecoverableByRetrying(int errorCode) {
  662. - return errorCode == ConnectionResult.INTERNAL_ERROR
  663. - || errorCode == ConnectionResult.NETWORK_ERROR
  664. - || errorCode == ConnectionResult.SERVICE_UPDATING;
  665. + return false;
  666. }
  667. }
  668. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
  669. --- a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
  670. +++ b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
  671. @@ -41,31 +41,10 @@ public class InstantAppsHandler {
  672. // TODO(mariakhomenko): Use system once we roll to O SDK.
  673. private static final int FLAG_DO_NOT_LAUNCH = 0x00000200;
  674. - // TODO(mariakhomenko): Depend directly on the constants once we roll to v8 libraries.
  675. - private static final String DO_NOT_LAUNCH_EXTRA =
  676. - "com.google.android.gms.instantapps.DO_NOT_LAUNCH_INSTANT_APP";
  677. -
  678. - protected static final String IS_REFERRER_TRUSTED_EXTRA =
  679. - "com.google.android.gms.instantapps.IS_REFERRER_TRUSTED";
  680. -
  681. - protected static final String IS_USER_CONFIRMED_LAUNCH_EXTRA =
  682. - "com.google.android.gms.instantapps.IS_USER_CONFIRMED_LAUNCH";
  683. -
  684. - protected static final String TRUSTED_REFERRER_PKG_EXTRA =
  685. - "com.google.android.gms.instantapps.TRUSTED_REFERRER_PKG";
  686. -
  687. + // this is kept to always remove it from intents
  688. public static final String IS_GOOGLE_SEARCH_REFERRER =
  689. "com.google.android.gms.instantapps.IS_GOOGLE_SEARCH_REFERRER";
  690. - private static final String BROWSER_LAUNCH_REASON =
  691. - "com.google.android.gms.instantapps.BROWSER_LAUNCH_REASON";
  692. -
  693. - private static final String SUPERVISOR_PKG = "com.google.android.instantapps.supervisor";
  694. -
  695. - private static final String[] SUPERVISOR_START_ACTIONS = {
  696. - "com.google.android.instantapps.START", "com.google.android.instantapps.nmr1.INSTALL",
  697. - "com.google.android.instantapps.nmr1.VIEW"};
  698. -
  699. // Only two possible call sources for fallback intents, set boundary at n+1.
  700. private static final int SOURCE_BOUNDARY = 3;
  701. @@ -85,14 +64,6 @@ public class InstantAppsHandler {
  702. * @return Whether the given intent is going to open an Instant App.
  703. */
  704. public static boolean isIntentToInstantApp(Intent intent) {
  705. - if (SUPERVISOR_PKG.equals(intent.getPackage())) return true;
  706. -
  707. - String intentAction = intent.getAction();
  708. - for (String action : SUPERVISOR_START_ACTIONS) {
  709. - if (action.equals(intentAction)) {
  710. - return true;
  711. - }
  712. - }
  713. return false;
  714. }
  715. @@ -127,20 +98,6 @@ public class InstantAppsHandler {
  716. * @param intent The current intent.
  717. */
  718. private void maybeRecordFallbackStats(Intent intent) {
  719. - Long startTime = IntentUtils.safeGetLongExtra(intent, INSTANT_APP_START_TIME_EXTRA, 0);
  720. - if (startTime > 0) {
  721. - RecordHistogram.recordTimesHistogram("Android.InstantApps.FallbackDuration",
  722. - SystemClock.elapsedRealtime() - startTime);
  723. - intent.removeExtra(INSTANT_APP_START_TIME_EXTRA);
  724. - }
  725. - int callSource = IntentUtils.safeGetIntExtra(intent, BROWSER_LAUNCH_REASON, 0);
  726. - if (callSource > 0 && callSource < SOURCE_BOUNDARY) {
  727. - RecordHistogram.recordEnumeratedHistogram(
  728. - "Android.InstantApps.CallSource", callSource, SOURCE_BOUNDARY);
  729. - intent.removeExtra(BROWSER_LAUNCH_REASON);
  730. - } else if (callSource >= SOURCE_BOUNDARY) {
  731. - Log.e(TAG, "Unexpected call source constant for Instant Apps: " + callSource);
  732. - }
  733. }
  734. /**
  735. @@ -175,14 +132,6 @@ public class InstantAppsHandler {
  736. return false;
  737. }
  738. - if (IntentUtils.safeGetBooleanExtra(intent, DO_NOT_LAUNCH_EXTRA, false)
  739. - || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
  740. - && (intent.getFlags() & FLAG_DO_NOT_LAUNCH) != 0)) {
  741. - maybeRecordFallbackStats(intent);
  742. - Log.i(TAG, "Not handling with Instant Apps (DO_NOT_LAUNCH_EXTRA)");
  743. - return false;
  744. - }
  745. -
  746. if (IntentUtils.safeGetBooleanExtra(
  747. intent, IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, false)
  748. || IntentUtils.safeHasExtra(intent, WebappConstants.EXTRA_SOURCE)
  749. @@ -207,7 +156,6 @@ public class InstantAppsHandler {
  750. }
  751. Intent callbackIntent = new Intent(intent);
  752. - callbackIntent.putExtra(DO_NOT_LAUNCH_EXTRA, true);
  753. callbackIntent.putExtra(INSTANT_APP_START_TIME_EXTRA, startTime);
  754. return tryLaunchingInstantApp(context, intent, isCustomTabsIntent, callbackIntent);
  755. @@ -309,12 +257,9 @@ public class InstantAppsHandler {
  756. Intent iaIntent = data.getIntent();
  757. if (data.getReferrer() != null) {
  758. iaIntent.putExtra(Intent.EXTRA_REFERRER, data.getReferrer());
  759. - iaIntent.putExtra(IS_REFERRER_TRUSTED_EXTRA, true);
  760. }
  761. Context appContext = ContextUtils.getApplicationContext();
  762. - iaIntent.putExtra(TRUSTED_REFERRER_PKG_EXTRA, appContext.getPackageName());
  763. - iaIntent.putExtra(IS_USER_CONFIRMED_LAUNCH_EXTRA, true);
  764. try {
  765. appContext.startActivity(iaIntent);
  766. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
  767. --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
  768. +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
  769. @@ -19,8 +19,6 @@ import androidx.annotation.NonNull;
  770. import androidx.annotation.Nullable;
  771. import androidx.annotation.VisibleForTesting;
  772. -import com.google.android.gms.common.GooglePlayServicesUtil;
  773. -
  774. import org.chromium.base.ActivityState;
  775. import org.chromium.base.ApplicationStatus;
  776. import org.chromium.base.ApplicationStatus.ActivityStateListener;
  777. @@ -456,13 +454,7 @@ public class UpdateStatusProvider implements ActivityStateListener {
  778. }
  779. private boolean isGooglePlayStoreAvailable(Context context) {
  780. - try {
  781. - context.getPackageManager().getPackageInfo(
  782. - GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE, 0);
  783. - } catch (PackageManager.NameNotFoundException e) {
  784. - return false;
  785. - }
  786. - return true;
  787. + return false;
  788. }
  789. private long getSize(StatFs statFs) {
  790. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
  791. --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
  792. +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
  793. @@ -11,11 +11,6 @@ import android.os.Message;
  794. import androidx.annotation.IntDef;
  795. -import com.google.android.play.core.appupdate.AppUpdateInfo;
  796. -import com.google.android.play.core.appupdate.testing.FakeAppUpdateManager;
  797. -import com.google.android.play.core.install.model.AppUpdateType;
  798. -import com.google.android.play.core.tasks.Task;
  799. -
  800. import org.chromium.base.ContextUtils;
  801. import org.chromium.base.task.PostTask;
  802. import org.chromium.chrome.browser.app.ChromeActivity;
  803. @@ -31,7 +26,7 @@ import java.lang.ref.WeakReference;
  804. * wrapper isn't meant to be used for a full integration test, but simulating all of the possible
  805. * error cases is a bit easier to do here.
  806. */
  807. -public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
  808. +public class FakeAppUpdateManagerWrapper {
  809. private static final int RESULT_IN_APP_UPDATE_FAILED = 1;
  810. private static final int STEP_DELAY_MS = 5000;
  811. private static final int TOAST_DURATION_MS = 2000;
  812. @@ -108,15 +103,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
  813. switch (event) {
  814. case Event.UPDATE_AVAILABLE:
  815. w.toast("Making app update available.");
  816. - w.setUpdateAvailable(10000 /* Figure out a better version? */);
  817. return;
  818. case Event.USER_ACCEPTS_UPDATE:
  819. w.toast("User accepts update.");
  820. - w.userAcceptsUpdate();
  821. return;
  822. case Event.USER_REJECTS_UPDATE:
  823. w.toast("User rejects update.");
  824. - w.userRejectsUpdate();
  825. return;
  826. case Event.TRIGGER_DOWNLOAD:
  827. w.toast("Triggering download.");
  828. @@ -124,27 +116,21 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
  829. return;
  830. case Event.DOWNLOAD_STARTS:
  831. w.toast("Download has started.");
  832. - w.downloadStarts();
  833. return;
  834. case Event.DOWNLOAD_FAILS:
  835. w.toast("Triggering download failure.");
  836. - w.downloadFails();
  837. return;
  838. case Event.USER_CANCELS_DOWNLOAD:
  839. w.toast("Triggering cancellation of download.");
  840. - w.userCancelsDownload();
  841. return;
  842. case Event.DOWNLOAD_COMPLETES:
  843. w.toast("Download completes.");
  844. - w.downloadCompletes();
  845. return;
  846. case Event.INSTALL_FAILS:
  847. w.toast("Triggering install failure.");
  848. - w.installFails();
  849. return;
  850. case Event.INSTALL_COMPLETES:
  851. w.toast("Triggering install completion.");
  852. - w.installCompletes();
  853. return;
  854. default:
  855. w.toast("Unknown event.");
  856. @@ -159,56 +145,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
  857. * @param endState at which point should the inline update flow end.
  858. */
  859. FakeAppUpdateManagerWrapper(@Type int endState) {
  860. - super(ContextUtils.getApplicationContext());
  861. mType = endState;
  862. mEventHandler = new EventHandler(this);
  863. if (mType != Type.NONE) execute(Event.UPDATE_AVAILABLE);
  864. }
  865. - // FakeAppUpdateManager implementation.
  866. - @Override
  867. - public boolean startUpdateFlowForResult(AppUpdateInfo appUpdateInfo,
  868. - @AppUpdateType int appUpdateType, Activity activity, int requestCode) {
  869. - toast("Starting update flow.");
  870. - // TODO(dtrainor): Simulate exceptions being thrown or returning false from the super call.
  871. - boolean success =
  872. - super.startUpdateFlowForResult(appUpdateInfo, appUpdateType, activity, requestCode);
  873. - if (!success) return false;
  874. -
  875. - assert activity instanceof ChromeActivity : "Unexpected triggering activity.";
  876. -
  877. - final int resultCode;
  878. - if (mType == Type.FAIL_DIALOG_CANCEL) {
  879. - resultCode = Activity.RESULT_CANCELED;
  880. - } else if (mType == Type.FAIL_DIALOG_UPDATE_FAILED) {
  881. - resultCode = RESULT_IN_APP_UPDATE_FAILED;
  882. - } else {
  883. - resultCode = Activity.RESULT_OK;
  884. - }
  885. -
  886. - PostTask.postDelayedTask(UiThreadTaskTraits.DEFAULT, () -> {
  887. - triggerDialogResponse((ChromeActivity) activity, requestCode, resultCode);
  888. - }, STEP_DELAY_MS);
  889. -
  890. - return true;
  891. - }
  892. -
  893. - @Override
  894. - public Task<Void> completeUpdate() {
  895. - toast("Completing update.");
  896. - Task<Void> result = super.completeUpdate();
  897. -
  898. - if (mType == Type.FAIL_INSTALL) {
  899. - postDelayedEvent(Event.INSTALL_FAILS);
  900. - } else {
  901. - postDelayedEvent(Event.INSTALL_COMPLETES);
  902. - // This doesn't actually restart Chrome in this case.
  903. - }
  904. -
  905. - return result;
  906. - }
  907. -
  908. private void triggerDialogResponse(ChromeActivity activity, int requestCode, int resultCode) {
  909. if (resultCode == Activity.RESULT_OK) {
  910. execute(Event.USER_ACCEPTS_UPDATE);
  911. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
  912. --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
  913. +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
  914. @@ -4,8 +4,6 @@
  915. package org.chromium.chrome.browser.omaha.inline;
  916. -import com.google.android.play.core.appupdate.AppUpdateManagerFactory;
  917. -
  918. import org.chromium.base.ContextUtils;
  919. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  920. import org.chromium.chrome.browser.omaha.UpdateConfigs;
  921. @@ -20,20 +18,6 @@ public class InlineUpdateControllerFactory {
  922. public static InlineUpdateController create(Runnable callback) {
  923. @FakeAppUpdateManagerWrapper.Type
  924. int mockInlineEndState = UpdateConfigs.getMockInlineScenarioEndState();
  925. - if (mockInlineEndState != FakeAppUpdateManagerWrapper.Type.NO_SIMULATION) {
  926. - // The config requires to run through a test controller, using the
  927. - // PlayInlineUpdateController, but with a fake Google Play backend that automatically
  928. - // goes through a scenario flow.
  929. - return new PlayInlineUpdateController(
  930. - callback, new FakeAppUpdateManagerWrapper(mockInlineEndState));
  931. - }
  932. -
  933. - if (ChromeFeatureList.isEnabled(ChromeFeatureList.INLINE_UPDATE_FLOW)) {
  934. - // The application configuration requires to use the real Google Play backend for inline
  935. - // updates.
  936. - return new PlayInlineUpdateController(
  937. - callback, AppUpdateManagerFactory.create(ContextUtils.getApplicationContext()));
  938. - }
  939. // No test scenario was in place, and the inline flow has not been enabled, so use a
  940. // controller with no functionality.
  941. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
  942. --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
  943. +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
  944. @@ -10,15 +10,6 @@ import android.content.IntentSender.SendIntentException;
  945. import androidx.annotation.IntDef;
  946. import androidx.annotation.Nullable;
  947. -import com.google.android.play.core.appupdate.AppUpdateInfo;
  948. -import com.google.android.play.core.appupdate.AppUpdateManager;
  949. -import com.google.android.play.core.install.InstallState;
  950. -import com.google.android.play.core.install.InstallStateUpdatedListener;
  951. -import com.google.android.play.core.install.model.AppUpdateType;
  952. -import com.google.android.play.core.install.model.InstallErrorCode;
  953. -import com.google.android.play.core.install.model.InstallStatus;
  954. -import com.google.android.play.core.install.model.UpdateAvailability;
  955. -
  956. import org.chromium.base.Log;
  957. import org.chromium.base.metrics.RecordHistogram;
  958. import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateState;
  959. @@ -32,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
  960. * in the foreground.
  961. */
  962. public class PlayInlineUpdateController
  963. - implements InlineUpdateController, InstallStateUpdatedListener {
  964. + implements InlineUpdateController {
  965. /**
  966. * Converts Play's InstallErrorCode enum to a stable monotomically incrementing Chrome enum.
  967. * This is used for metric stability.
  968. @@ -127,26 +118,9 @@ public class PlayInlineUpdateController
  969. private static final int RESULT_IN_APP_UPDATE_FAILED = 1;
  970. private static final int REQUEST_CODE = 8123;
  971. - private final Runnable mCallback;
  972. - private final AppUpdateManager mAppUpdateManager;
  973. -
  974. private boolean mEnabled;
  975. private @Nullable @UpdateState Integer mUpdateState;
  976. - private AppUpdateInfo mAppUpdateInfo;
  977. - private @Nullable @UpdateAvailability Integer mUpdateAvailability;
  978. - private @Nullable @InstallStatus Integer mInstallStatus;
  979. -
  980. - /**
  981. - * Builds an instance of {@link PlayInlineUpdateController}.
  982. - * @param callback The {@link Runnable} to notify when an inline update state change occurs.
  983. - */
  984. - PlayInlineUpdateController(Runnable callback, AppUpdateManager appUpdateManager) {
  985. - mCallback = callback;
  986. - mAppUpdateManager = appUpdateManager;
  987. - setEnabled(true);
  988. - }
  989. -
  990. // InlineUpdateController implementation.
  991. @Override
  992. public void setEnabled(boolean enabled) {
  993. @@ -155,10 +129,8 @@ public class PlayInlineUpdateController
  994. if (mEnabled) {
  995. mUpdateState = UpdateState.NONE;
  996. - mAppUpdateManager.registerListener(this);
  997. pullCurrentState();
  998. } else {
  999. - mAppUpdateManager.unregisterListener(this);
  1000. }
  1001. }
  1002. @@ -169,220 +141,26 @@ public class PlayInlineUpdateController
  1003. @Override
  1004. public void startUpdate(Activity activity) {
  1005. - try {
  1006. - boolean success = mAppUpdateManager.startUpdateFlowForResult(
  1007. - mAppUpdateInfo, AppUpdateType.FLEXIBLE, activity, REQUEST_CODE);
  1008. - Log.i(TAG, "startUpdateFlowForResult() returned " + success);
  1009. -
  1010. - if (!success) recordCallFailure(CallFailure.START_FAILED);
  1011. - } catch (SendIntentException exception) {
  1012. - mInstallStatus = InstallStatus.FAILED;
  1013. - Log.i(TAG, "startUpdateFlowForResult() threw an exception.");
  1014. - recordCallFailure(CallFailure.START_EXCEPTION);
  1015. - }
  1016. - // TODO(dtrainor): Use success.
  1017. }
  1018. @Override
  1019. public void completeUpdate() {
  1020. - mAppUpdateManager.completeUpdate()
  1021. - .addOnSuccessListener(unused -> {
  1022. - Log.i(TAG, "completeUpdate() success.");
  1023. - pushStatus();
  1024. - })
  1025. - .addOnFailureListener(exception -> {
  1026. - Log.i(TAG, "completeUpdate() failed.");
  1027. - recordCallFailure(CallFailure.COMPLETE_FAILED);
  1028. - mInstallStatus = InstallStatus.FAILED;
  1029. - pushStatus();
  1030. - });
  1031. - }
  1032. -
  1033. - // InstallStateUpdatedListener implementation.
  1034. - @Override
  1035. - public void onStateUpdate(InstallState state) {
  1036. - Log.i(TAG,
  1037. - "onStateUpdate(" + state.installStatus() + ", " + state.installErrorCode() + ")");
  1038. -
  1039. - if (state.installStatus() != mInstallStatus) {
  1040. - RecordHistogram.recordEnumeratedHistogram("GoogleUpdate.Inline.StateChange.Error."
  1041. - + installStatusToEnumSuffix(state.installStatus()),
  1042. - installErrorCodeToMetrics(state.installErrorCode()),
  1043. - InstallErrorCodeMetrics.NUM_ENTRIES);
  1044. - }
  1045. -
  1046. - mInstallStatus = state.installStatus();
  1047. - pushStatus();
  1048. }
  1049. private void pullCurrentState() {
  1050. - mAppUpdateManager.getAppUpdateInfo()
  1051. - .addOnSuccessListener(info -> {
  1052. - mAppUpdateInfo = info;
  1053. - mUpdateAvailability = info.updateAvailability();
  1054. - mInstallStatus = info.installStatus();
  1055. - Log.i(TAG,
  1056. - "pullCurrentState(" + mUpdateAvailability + ", " + mInstallStatus
  1057. - + ") success.");
  1058. - recordOnAppUpdateInfo(info);
  1059. - pushStatus();
  1060. - })
  1061. - .addOnFailureListener(exception -> {
  1062. - mAppUpdateInfo = null;
  1063. - mUpdateAvailability = UpdateAvailability.UNKNOWN;
  1064. - mInstallStatus = InstallStatus.UNKNOWN;
  1065. - Log.i(TAG, "pullCurrentState() failed.");
  1066. - recordCallFailure(CallFailure.QUERY_FAILED);
  1067. - pushStatus();
  1068. - });
  1069. }
  1070. private void pushStatus() {
  1071. - if (!mEnabled || mUpdateAvailability == null || mInstallStatus == null) return;
  1072. -
  1073. - @UpdateState
  1074. - int newState = toUpdateState(mUpdateAvailability, mInstallStatus);
  1075. - if (mUpdateState != null && mUpdateState == newState) return;
  1076. -
  1077. - Log.i(TAG, "Pushing inline update state to " + newState);
  1078. - mUpdateState = newState;
  1079. - mCallback.run();
  1080. }
  1081. private static @UpdateState int toUpdateState(
  1082. - @UpdateAvailability int updateAvailability, @InstallStatus int installStatus) {
  1083. + int updateAvailability, int installStatus) {
  1084. @UpdateState
  1085. int newStatus = UpdateState.NONE;
  1086. - // Note, use InstallStatus first then UpdateAvailability if InstallStatus doesn't indicate
  1087. - // a currently active install.
  1088. - switch (installStatus) {
  1089. - case InstallStatus.PENDING:
  1090. - // Intentional fall through.
  1091. - case InstallStatus.DOWNLOADING:
  1092. - newStatus = UpdateState.INLINE_UPDATE_DOWNLOADING;
  1093. - break;
  1094. - case InstallStatus.DOWNLOADED:
  1095. - newStatus = UpdateState.INLINE_UPDATE_READY;
  1096. - break;
  1097. - case InstallStatus.FAILED:
  1098. - newStatus = UpdateState.INLINE_UPDATE_FAILED;
  1099. - break;
  1100. - }
  1101. -
  1102. - if (newStatus == UpdateState.NONE) {
  1103. - switch (updateAvailability) {
  1104. - case UpdateAvailability.UPDATE_AVAILABLE:
  1105. - newStatus = UpdateState.INLINE_UPDATE_AVAILABLE;
  1106. - break;
  1107. - }
  1108. - }
  1109. -
  1110. return newStatus;
  1111. }
  1112. - private static String installStatusToEnumSuffix(@InstallStatus int status) {
  1113. - switch (status) {
  1114. - case InstallStatus.UNKNOWN:
  1115. - return "Unknown";
  1116. - case InstallStatus.REQUIRES_UI_INTENT:
  1117. - return "RequiresUiIntent";
  1118. - case InstallStatus.PENDING:
  1119. - return "Pending";
  1120. - case InstallStatus.DOWNLOADING:
  1121. - return "Downloading";
  1122. - case InstallStatus.DOWNLOADED:
  1123. - return "Downloaded";
  1124. - case InstallStatus.INSTALLING:
  1125. - return "Installing";
  1126. - case InstallStatus.INSTALLED:
  1127. - return "Installed";
  1128. - case InstallStatus.FAILED:
  1129. - return "Failed";
  1130. - case InstallStatus.CANCELED:
  1131. - return "Canceled";
  1132. - default:
  1133. - return "Untracked";
  1134. - }
  1135. - }
  1136. -
  1137. - private static @InstallErrorCodeMetrics int installErrorCodeToMetrics(
  1138. - @InstallErrorCode int error) {
  1139. - switch (error) {
  1140. - case InstallErrorCode.NO_ERROR:
  1141. - return InstallErrorCodeMetrics.NO_ERROR;
  1142. - case InstallErrorCode.NO_ERROR_PARTIALLY_ALLOWED:
  1143. - return InstallErrorCodeMetrics.NO_ERROR_PARTIALLY_ALLOWED;
  1144. - case InstallErrorCode.ERROR_UNKNOWN:
  1145. - return InstallErrorCodeMetrics.ERROR_UNKNOWN;
  1146. - case InstallErrorCode.ERROR_API_NOT_AVAILABLE:
  1147. - return InstallErrorCodeMetrics.ERROR_API_NOT_AVAILABLE;
  1148. - case InstallErrorCode.ERROR_INVALID_REQUEST:
  1149. - return InstallErrorCodeMetrics.ERROR_INVALID_REQUEST;
  1150. - case InstallErrorCode.ERROR_INSTALL_UNAVAILABLE:
  1151. - return InstallErrorCodeMetrics.ERROR_INSTALL_UNAVAILABLE;
  1152. - case InstallErrorCode.ERROR_INSTALL_NOT_ALLOWED:
  1153. - return InstallErrorCodeMetrics.ERROR_INSTALL_NOT_ALLOWED;
  1154. - case InstallErrorCode.ERROR_DOWNLOAD_NOT_PRESENT:
  1155. - return InstallErrorCodeMetrics.ERROR_DOWNLOAD_NOT_PRESENT;
  1156. - case InstallErrorCode.ERROR_INTERNAL_ERROR:
  1157. - return InstallErrorCodeMetrics.ERROR_INTERNAL_ERROR;
  1158. - default:
  1159. - return InstallErrorCodeMetrics.ERROR_UNTRACKED;
  1160. - }
  1161. - }
  1162. -
  1163. - private static @UpdateAvailabilityMetric int updateAvailabilityToMetrics(
  1164. - @UpdateAvailability int updateAvailability) {
  1165. - switch (updateAvailability) {
  1166. - case UpdateAvailability.UNKNOWN:
  1167. - return UpdateAvailabilityMetric.UNKNOWN;
  1168. - case UpdateAvailability.UPDATE_NOT_AVAILABLE:
  1169. - return UpdateAvailabilityMetric.UPDATE_NOT_AVAILABLE;
  1170. - case UpdateAvailability.UPDATE_AVAILABLE:
  1171. - return UpdateAvailabilityMetric.UPDATE_AVAILABLE;
  1172. - case UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS:
  1173. - return UpdateAvailabilityMetric.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS;
  1174. - default:
  1175. - return UpdateAvailabilityMetric.UNTRACKED;
  1176. - }
  1177. - }
  1178. -
  1179. - private static @InstallStatusMetric int installStatusToMetrics(
  1180. - @InstallStatus int installStatus) {
  1181. - switch (installStatus) {
  1182. - case InstallStatus.UNKNOWN:
  1183. - return InstallStatusMetric.UNKNOWN;
  1184. - case InstallStatus.REQUIRES_UI_INTENT:
  1185. - return InstallStatusMetric.REQUIRES_UI_INTENT;
  1186. - case InstallStatus.PENDING:
  1187. - return InstallStatusMetric.PENDING;
  1188. - case InstallStatus.DOWNLOADING:
  1189. - return InstallStatusMetric.DOWNLOADING;
  1190. - case InstallStatus.DOWNLOADED:
  1191. - return InstallStatusMetric.DOWNLOADED;
  1192. - case InstallStatus.INSTALLING:
  1193. - return InstallStatusMetric.INSTALLING;
  1194. - case InstallStatus.INSTALLED:
  1195. - return InstallStatusMetric.INSTALLED;
  1196. - case InstallStatus.FAILED:
  1197. - return InstallStatusMetric.FAILED;
  1198. - case InstallStatus.CANCELED:
  1199. - return InstallStatusMetric.CANCELED;
  1200. - default:
  1201. - return InstallStatusMetric.UNTRACKED;
  1202. - }
  1203. - }
  1204. -
  1205. - private static void recordOnAppUpdateInfo(AppUpdateInfo info) {
  1206. - RecordHistogram.recordEnumeratedHistogram(
  1207. - "GoogleUpdate.Inline.AppUpdateInfo.UpdateAvailability",
  1208. - updateAvailabilityToMetrics(info.updateAvailability()),
  1209. - UpdateAvailabilityMetric.NUM_ENTRIES);
  1210. - RecordHistogram.recordEnumeratedHistogram("GoogleUpdate.Inline.AppUpdateInfo.InstallStatus",
  1211. - installStatusToMetrics(info.installStatus()), InstallStatusMetric.NUM_ENTRIES);
  1212. - }
  1213. -
  1214. private static void recordCallFailure(@CallFailure int failure) {
  1215. RecordHistogram.recordEnumeratedHistogram(
  1216. "GoogleUpdate.Inline.CallFailure", failure, CallFailure.NUM_ENTRIES);
  1217. diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/modules/chrome_feature_modules.gni
  1218. --- a/chrome/android/modules/chrome_feature_modules.gni
  1219. +++ b/chrome/android/modules/chrome_feature_modules.gni
  1220. @@ -8,8 +8,6 @@ import(
  1221. import("//chrome/android/features/dev_ui/dev_ui_module.gni")
  1222. import("//chrome/android/features/tab_ui/tab_ui_module.gni")
  1223. import("//chrome/android/modules/buildflags.gni")
  1224. -import(
  1225. - "//chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni")
  1226. import("//chrome/android/modules/extra_icu/extra_icu_module.gni")
  1227. import("//chrome/android/modules/stack_unwinder/stack_unwinder_module.gni")
  1228. import("//chrome/android/modules/test_dummy/test_dummy_module.gni")
  1229. @@ -66,7 +64,6 @@ if (!disable_autofill_assistant_dfm) {
  1230. if (!disable_tab_ui_dfm) {
  1231. monochrome_module_descs += [ tab_ui_module_desc ]
  1232. }
  1233. -monochrome_module_descs += [ cablev2_authenticator_module_desc ]
  1234. # Modules shipped in Trichrome (Android Q+).
  1235. trichrome_module_descs = monochrome_module_descs
  1236. diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
  1237. --- a/chrome/browser/BUILD.gn
  1238. +++ b/chrome/browser/BUILD.gn
  1239. @@ -6501,8 +6501,6 @@ static_library("browser") {
  1240. "offline_pages/offliner_helper.h",
  1241. "offline_pages/offliner_user_data.cc",
  1242. "offline_pages/offliner_user_data.h",
  1243. - "offline_pages/prefetch/gcm_token.cc",
  1244. - "offline_pages/prefetch/gcm_token.h",
  1245. "offline_pages/prefetch/offline_metrics_collector_impl.cc",
  1246. "offline_pages/prefetch/offline_metrics_collector_impl.h",
  1247. "offline_pages/prefetch/offline_prefetch_download_client.cc",
  1248. diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/android/BUILD.gn
  1249. --- a/chrome/browser/language/android/BUILD.gn
  1250. +++ b/chrome/browser/language/android/BUILD.gn
  1251. @@ -9,13 +9,11 @@ android_library("base_module_java") {
  1252. sources = [
  1253. "java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java",
  1254. "java/src/org/chromium/chrome/browser/language/GlobalAppLocaleController.java",
  1255. - "java/src/org/chromium/chrome/browser/language/LanguageSplitInstaller.java",
  1256. ]
  1257. deps = [
  1258. "//base:base_java",
  1259. "//chrome/browser/preferences:java",
  1260. "//components/language/android:language_bridge_java",
  1261. - "//third_party/android_deps:com_google_android_play_core_java",
  1262. "//third_party/androidx:androidx_annotation_annotation_java",
  1263. "//ui/android:ui_no_recycler_view_java",
  1264. ]
  1265. diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java
  1266. --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java
  1267. +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java
  1268. @@ -459,19 +459,6 @@ public class AppLanguagePromoDialog {
  1269. }
  1270. AndroidLanguageMetricsBridge.reportAppLanguagePromptLanguage(
  1271. selectedLanguage.isSystemDefault() ? "" : selectedLanguage.getCode());
  1272. -
  1273. - // Create call back for after language split install completes.
  1274. - AppLocaleUtils.setAppLanguagePref(selectedLanguage.getCode(), (success) -> {
  1275. - if (success) {
  1276. - mRestartAction.restart();
  1277. - } else {
  1278. - CharSequence failedText = mActivity.getResources().getString(
  1279. - R.string.languages_split_failed, selectedLanguage.getDisplayName());
  1280. - messageView.setText(failedText);
  1281. - mConfirmModal.set(ModalDialogProperties.POSITIVE_BUTTON_TEXT,
  1282. - mActivity.getText(R.string.ok).toString());
  1283. - }
  1284. - });
  1285. }
  1286. /**
  1287. diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
  1288. --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
  1289. +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
  1290. @@ -87,14 +87,6 @@ public class AppLanguagePreferenceDelegate {
  1291. // Disable preference so a second downloaded cannot be started while one is in progress.
  1292. mPreference.setEnabled(false);
  1293. -
  1294. - AppLocaleUtils.setAppLanguagePref(code, (success) -> {
  1295. - if (success) {
  1296. - languageSplitDownloadComplete();
  1297. - } else {
  1298. - languageSplitDownloadFailed();
  1299. - }
  1300. - });
  1301. }
  1302. /**
  1303. diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
  1304. --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
  1305. +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
  1306. @@ -19,7 +19,6 @@ import org.chromium.base.Log;
  1307. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  1308. import org.chromium.chrome.browser.language.AppLocaleUtils;
  1309. import org.chromium.chrome.browser.language.GlobalAppLocaleController;
  1310. -import org.chromium.chrome.browser.language.LanguageSplitInstaller;
  1311. import org.chromium.chrome.browser.language.R;
  1312. import org.chromium.chrome.browser.preferences.Pref;
  1313. import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
  1314. @@ -101,11 +100,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
  1315. * translate target language, and detailed translate preferences.
  1316. */
  1317. private void createDetailedPreferences(Bundle savedInstanceState, String rootKey) {
  1318. - // Log currently installed language splits.
  1319. - String installedLanguages =
  1320. - TextUtils.join(",", LanguageSplitInstaller.getInstance().getInstalledLanguages());
  1321. - Log.i(TAG, TextUtils.concat("Installed Languages: ", installedLanguages).toString());
  1322. -
  1323. SettingsUtils.addPreferencesFromResource(this, R.xml.languages_detailed_preferences);
  1324. setupAppLanguageSection();
  1325. diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc
  1326. --- a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc
  1327. +++ b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc
  1328. @@ -18,7 +18,6 @@
  1329. #include "chrome/browser/image_fetcher/image_fetcher_service_factory.h"
  1330. #include "chrome/browser/net/system_network_context_manager.h"
  1331. #include "chrome/browser/offline_pages/offline_page_model_factory.h"
  1332. -#include "chrome/browser/offline_pages/prefetch/gcm_token.h"
  1333. #include "chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h"
  1334. #include "chrome/browser/offline_pages/prefetch/prefetch_background_task_handler_impl.h"
  1335. #include "chrome/browser/profiles/profile.h"
  1336. @@ -68,21 +67,6 @@ void SwitchToFullBrowserImageFetcher(PrefetchServiceImpl* prefetch_service,
  1337. }
  1338. void OnProfileCreated(PrefetchServiceImpl* prefetch_service, Profile* profile) {
  1339. - if (IsPrefetchingOfflinePagesEnabled()) {
  1340. - // Trigger an update of the cached GCM token. This needs to be post tasked
  1341. - // because otherwise leads to circular dependency between
  1342. - // PrefetchServiceFactory and GCMProfileServiceFactory. See
  1343. - // https://crbug.com/944952
  1344. - // Update is not a priority so make sure it happens after the critical
  1345. - // startup path.
  1346. - content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
  1347. - ->PostTask(FROM_HERE,
  1348. - base::BindOnce(
  1349. - &GetGCMToken, profile, kPrefetchingOfflinePagesAppId,
  1350. - base::BindOnce(&PrefetchServiceImpl::GCMTokenReceived,
  1351. - prefetch_service->GetWeakPtr())));
  1352. - }
  1353. -
  1354. SwitchToFullBrowserImageFetcher(prefetch_service, profile->GetProfileKey());
  1355. }
  1356. diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc
  1357. --- a/chrome/browser/push_messaging/push_messaging_service_factory.cc
  1358. +++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
  1359. @@ -28,13 +28,7 @@
  1360. // static
  1361. PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile(
  1362. content::BrowserContext* context) {
  1363. - // The Push API is not currently supported in incognito mode.
  1364. - // See https://crbug.com/401439.
  1365. - if (context->IsOffTheRecord())
  1366. - return nullptr;
  1367. -
  1368. - return static_cast<PushMessagingServiceImpl*>(
  1369. - GetInstance()->GetServiceForBrowserContext(context, true));
  1370. + return nullptr;
  1371. }
  1372. // static
  1373. diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
  1374. --- a/chrome/browser/ui/BUILD.gn
  1375. +++ b/chrome/browser/ui/BUILD.gn
  1376. @@ -254,8 +254,6 @@ static_library("ui") {
  1377. "webui/flags/flags_ui.h",
  1378. "webui/flags/flags_ui_handler.cc",
  1379. "webui/flags/flags_ui_handler.h",
  1380. - "webui/gcm_internals_ui.cc",
  1381. - "webui/gcm_internals_ui.h",
  1382. "webui/internals/internals_ui.cc",
  1383. "webui/internals/internals_ui.h",
  1384. "webui/interstitials/interstitial_ui.cc",
  1385. @@ -483,7 +481,6 @@ static_library("ui") {
  1386. "//components/feedback/content",
  1387. "//components/find_in_page",
  1388. "//components/flags_ui",
  1389. - "//components/gcm_driver",
  1390. "//components/google/core/common",
  1391. "//components/heap_profiling/multi_process",
  1392. "//components/history/content/browser",
  1393. diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
  1394. --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
  1395. +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
  1396. @@ -37,7 +37,6 @@
  1397. #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h"
  1398. #include "chrome/browser/ui/webui/federated_learning/floc_internals_ui.h"
  1399. #include "chrome/browser/ui/webui/flags/flags_ui.h"
  1400. -#include "chrome/browser/ui/webui/gcm_internals_ui.h"
  1401. #include "chrome/browser/ui/webui/image_editor/image_editor_ui.h"
  1402. #include "chrome/browser/ui/webui/internals/internals_ui.h"
  1403. #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
  1404. @@ -629,8 +628,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
  1405. return &NewWebUI<FlagsUI>;
  1406. if (url.host_piece() == chrome::kChromeUIFlocInternalsHost)
  1407. return &NewWebUI<FlocInternalsUI>;
  1408. - if (url.host_piece() == chrome::kChromeUIGCMInternalsHost)
  1409. - return &NewWebUI<GCMInternalsUI>;
  1410. if (url.host_piece() == chrome::kChromeUIInternalsHost)
  1411. return &NewWebUI<InternalsUI>;
  1412. if (url.host_piece() == chrome::kChromeUIInterstitialHost)
  1413. diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
  1414. --- a/chrome/test/android/BUILD.gn
  1415. +++ b/chrome/test/android/BUILD.gn
  1416. @@ -268,8 +268,6 @@ android_library("chrome_java_test_support") {
  1417. ]
  1418. deps = [
  1419. - "$google_play_services_package:google_play_services_base_java",
  1420. - "$google_play_services_package:google_play_services_basement_java",
  1421. "//base:base_java",
  1422. "//base:base_java_test_support",
  1423. "//chrome/android:base_module_java",
  1424. diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
  1425. --- a/components/background_task_scheduler/BUILD.gn
  1426. +++ b/components/background_task_scheduler/BUILD.gn
  1427. @@ -121,11 +121,6 @@ if (is_android) {
  1428. deps = [
  1429. ":background_task_scheduler_task_ids_java",
  1430. - "$google_play_services_package:google_play_services_auth_base_java",
  1431. - "$google_play_services_package:google_play_services_base_java",
  1432. - "$google_play_services_package:google_play_services_basement_java",
  1433. - "$google_play_services_package:google_play_services_gcm_java",
  1434. - "$google_play_services_package:google_play_services_tasks_java",
  1435. "internal:internal_java",
  1436. "internal:proto_java",
  1437. "//base:base_java",
  1438. diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components/background_task_scheduler/internal/BUILD.gn
  1439. --- a/components/background_task_scheduler/internal/BUILD.gn
  1440. +++ b/components/background_task_scheduler/internal/BUILD.gn
  1441. @@ -11,12 +11,10 @@ if (is_android) {
  1442. android_library("internal_java") {
  1443. sources = [
  1444. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskBroadcastReceiver.java",
  1445. - "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java",
  1446. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobService.java",
  1447. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManager.java",
  1448. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerDelegate.java",
  1449. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java",
  1450. - "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java",
  1451. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImpl.java",
  1452. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobService.java",
  1453. "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerPrefs.java",
  1454. @@ -27,10 +25,6 @@ if (is_android) {
  1455. deps = [
  1456. ":proto_java",
  1457. - "$google_play_services_package:google_play_services_base_java",
  1458. - "$google_play_services_package:google_play_services_basement_java",
  1459. - "$google_play_services_package:google_play_services_gcm_java",
  1460. - "$google_play_services_package:google_play_services_tasks_java",
  1461. "//base:base_java",
  1462. "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
  1463. "//components/background_task_scheduler:public_java",
  1464. @@ -98,10 +92,6 @@ if (is_android) {
  1465. deps = [
  1466. ":internal_java",
  1467. - "$google_play_services_package:google_play_services_base_java",
  1468. - "$google_play_services_package:google_play_services_basement_java",
  1469. - "$google_play_services_package:google_play_services_gcm_java",
  1470. - "$google_play_services_package:google_play_services_tasks_java",
  1471. "//base:base_java",
  1472. "//base:base_java_test_support",
  1473. "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
  1474. diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java
  1475. deleted file mode 100644
  1476. --- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java
  1477. +++ /dev/null
  1478. @@ -1,160 +0,0 @@
  1479. -// Copyright 2017 The Chromium Authors. All rights reserved.
  1480. -// Use of this source code is governed by a BSD-style license that can be
  1481. -// found in the LICENSE file.
  1482. -
  1483. -package org.chromium.components.background_task_scheduler.internal;
  1484. -
  1485. -import android.os.Build;
  1486. -
  1487. -import androidx.annotation.VisibleForTesting;
  1488. -
  1489. -import com.google.android.gms.gcm.GcmNetworkManager;
  1490. -import com.google.android.gms.gcm.GcmTaskService;
  1491. -import com.google.android.gms.gcm.TaskParams;
  1492. -
  1493. -import org.chromium.base.ContextUtils;
  1494. -import org.chromium.base.Log;
  1495. -import org.chromium.base.ThreadUtils;
  1496. -import org.chromium.components.background_task_scheduler.BackgroundTask;
  1497. -import org.chromium.components.background_task_scheduler.TaskParameters;
  1498. -
  1499. -import java.util.concurrent.CountDownLatch;
  1500. -import java.util.concurrent.TimeUnit;
  1501. -import java.util.concurrent.atomic.AtomicBoolean;
  1502. -
  1503. -/** Delegates calls out to various tasks that need to run in the background. */
  1504. -public class BackgroundTaskGcmTaskService extends GcmTaskService {
  1505. - private static final String TAG = "BkgrdTaskGcmTS";
  1506. -
  1507. - private BackgroundTaskSchedulerGcmNetworkManager.Clock mClock = System::currentTimeMillis;
  1508. -
  1509. - @VisibleForTesting
  1510. - void setClockForTesting(BackgroundTaskSchedulerGcmNetworkManager.Clock clock) {
  1511. - mClock = clock;
  1512. - }
  1513. -
  1514. - /** Class that waits for the processing to be done. */
  1515. - private static class Waiter {
  1516. - // Wakelock is only held for 3 minutes by default for GcmTaskService.
  1517. - private static final long MAX_TIMEOUT_SECONDS = 179;
  1518. - private final CountDownLatch mLatch;
  1519. - private long mWaiterTimeoutSeconds;
  1520. - private boolean mIsRescheduleNeeded;
  1521. - private boolean mHasTaskTimedOut;
  1522. -
  1523. - public Waiter(long waiterTimeoutSeconds) {
  1524. - mLatch = new CountDownLatch(1);
  1525. - mWaiterTimeoutSeconds = Math.min(waiterTimeoutSeconds, MAX_TIMEOUT_SECONDS);
  1526. - }
  1527. -
  1528. - /** Start waiting for the processing to finish. */
  1529. - public void startWaiting() {
  1530. - try {
  1531. - mHasTaskTimedOut = !mLatch.await(mWaiterTimeoutSeconds, TimeUnit.SECONDS);
  1532. - } catch (InterruptedException e) {
  1533. - Log.d(TAG, "Waiter interrupted while waiting.");
  1534. - }
  1535. - }
  1536. -
  1537. - /** Called to finish waiting. */
  1538. - public void onWaitDone(boolean needsRescheduling) {
  1539. - mIsRescheduleNeeded = needsRescheduling;
  1540. - mLatch.countDown();
  1541. - }
  1542. -
  1543. - /** @return Whether last task timed out. */
  1544. - public boolean hasTaskTimedOut() {
  1545. - return mHasTaskTimedOut;
  1546. - }
  1547. -
  1548. - /** @return Whether task needs to be rescheduled. */
  1549. - public boolean isRescheduleNeeded() {
  1550. - return mIsRescheduleNeeded;
  1551. - }
  1552. - }
  1553. -
  1554. - private static class TaskFinishedCallbackGcmTaskService
  1555. - implements BackgroundTask.TaskFinishedCallback {
  1556. - private final Waiter mWaiter;
  1557. -
  1558. - public TaskFinishedCallbackGcmTaskService(Waiter waiter) {
  1559. - mWaiter = waiter;
  1560. - }
  1561. -
  1562. - @Override
  1563. - public void taskFinished(final boolean needsReschedule) {
  1564. - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
  1565. - @Override
  1566. - public void run() {
  1567. - mWaiter.onWaitDone(needsReschedule);
  1568. - }
  1569. - });
  1570. - }
  1571. - }
  1572. -
  1573. - @Override
  1574. - public int onRunTask(TaskParams params) {
  1575. - final TaskParameters taskParams =
  1576. - BackgroundTaskSchedulerGcmNetworkManager.getTaskParametersFromTaskParams(params);
  1577. -
  1578. - final BackgroundTask backgroundTask =
  1579. - BackgroundTaskSchedulerFactoryInternal.getBackgroundTaskFromTaskId(
  1580. - taskParams.getTaskId());
  1581. - if (backgroundTask == null) {
  1582. - Log.w(TAG, "Failed to start task. Could not instantiate BackgroundTask class.");
  1583. - // Cancel task if the BackgroundTask class is not found anymore. We assume this means
  1584. - // that the task has been deprecated.
  1585. - BackgroundTaskSchedulerFactoryInternal.getScheduler().cancel(
  1586. - ContextUtils.getApplicationContext(), taskParams.getTaskId());
  1587. - return GcmNetworkManager.RESULT_FAILURE;
  1588. - }
  1589. -
  1590. - if (BackgroundTaskSchedulerGcmNetworkManager.didTaskExpire(
  1591. - params, mClock.currentTimeMillis())) {
  1592. - BackgroundTaskSchedulerUma.getInstance().reportTaskExpired(taskParams.getTaskId());
  1593. - return GcmNetworkManager.RESULT_FAILURE;
  1594. - }
  1595. -
  1596. - final Waiter waiter = new Waiter(Waiter.MAX_TIMEOUT_SECONDS);
  1597. -
  1598. - final AtomicBoolean taskNeedsBackgroundProcessing = new AtomicBoolean();
  1599. - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
  1600. - @Override
  1601. - public void run() {
  1602. - BackgroundTaskSchedulerUma.getInstance().reportTaskStarted(taskParams.getTaskId());
  1603. - taskNeedsBackgroundProcessing.set(
  1604. - backgroundTask.onStartTask(ContextUtils.getApplicationContext(), taskParams,
  1605. - new TaskFinishedCallbackGcmTaskService(waiter)));
  1606. - }
  1607. - });
  1608. -
  1609. - if (!taskNeedsBackgroundProcessing.get()) return GcmNetworkManager.RESULT_SUCCESS;
  1610. -
  1611. - waiter.startWaiting();
  1612. -
  1613. - if (waiter.isRescheduleNeeded()) return GcmNetworkManager.RESULT_RESCHEDULE;
  1614. - if (!waiter.hasTaskTimedOut()) return GcmNetworkManager.RESULT_SUCCESS;
  1615. -
  1616. - final AtomicBoolean taskNeedsRescheduling = new AtomicBoolean();
  1617. - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
  1618. - @Override
  1619. - public void run() {
  1620. - BackgroundTaskSchedulerUma.getInstance().reportTaskStopped(taskParams.getTaskId());
  1621. - taskNeedsRescheduling.set(backgroundTask.onStopTask(
  1622. - ContextUtils.getApplicationContext(), taskParams));
  1623. - }
  1624. - });
  1625. -
  1626. - if (taskNeedsRescheduling.get()) return GcmNetworkManager.RESULT_RESCHEDULE;
  1627. -
  1628. - return GcmNetworkManager.RESULT_SUCCESS;
  1629. - }
  1630. -
  1631. - @Override
  1632. - public void onInitializeTasks() {
  1633. - // Ignore the event on OSs supporting JobScheduler.
  1634. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
  1635. - BackgroundTaskSchedulerFactoryInternal.getScheduler().reschedule(
  1636. - ContextUtils.getApplicationContext());
  1637. - }
  1638. -}
  1639. diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java
  1640. --- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java
  1641. +++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java
  1642. @@ -21,11 +21,7 @@ public final class BackgroundTaskSchedulerFactoryInternal {
  1643. private static BackgroundTaskFactory sBackgroundTaskFactory;
  1644. static BackgroundTaskSchedulerDelegate getSchedulerDelegateForSdk(int sdkInt) {
  1645. - if (sdkInt >= Build.VERSION_CODES.M) {
  1646. - return new BackgroundTaskSchedulerJobService();
  1647. - } else {
  1648. - return new BackgroundTaskSchedulerGcmNetworkManager();
  1649. - }
  1650. + return new BackgroundTaskSchedulerJobService();
  1651. }
  1652. /**
  1653. diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java
  1654. deleted file mode 100644
  1655. --- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java
  1656. +++ /dev/null
  1657. @@ -1,257 +0,0 @@
  1658. -// Copyright 2017 The Chromium Authors. All rights reserved.
  1659. -// Use of this source code is governed by a BSD-style license that can be
  1660. -// found in the LICENSE file.
  1661. -
  1662. -package org.chromium.components.background_task_scheduler.internal;
  1663. -
  1664. -import android.content.Context;
  1665. -import android.os.Bundle;
  1666. -
  1667. -import androidx.annotation.NonNull;
  1668. -import androidx.annotation.VisibleForTesting;
  1669. -
  1670. -import com.google.android.gms.gcm.GcmNetworkManager;
  1671. -import com.google.android.gms.gcm.OneoffTask;
  1672. -import com.google.android.gms.gcm.PeriodicTask;
  1673. -import com.google.android.gms.gcm.Task;
  1674. -import com.google.android.gms.gcm.TaskParams;
  1675. -
  1676. -import org.chromium.base.Log;
  1677. -import org.chromium.base.ThreadUtils;
  1678. -import org.chromium.components.background_task_scheduler.TaskInfo;
  1679. -import org.chromium.components.background_task_scheduler.TaskParameters;
  1680. -import org.chromium.gms.ChromiumPlayServicesAvailability;
  1681. -
  1682. -import java.util.concurrent.TimeUnit;
  1683. -
  1684. -/**
  1685. - * An implementation of {@link BackgroundTaskSchedulerDelegate} that uses the Play Services
  1686. - * {@link GcmNetworkManager} to schedule jobs.
  1687. - */
  1688. -class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedulerDelegate {
  1689. - private static final String TAG = "BkgrdTaskSchedGcmNM";
  1690. -
  1691. - /** Delta time for expiration checks, after the end time. */
  1692. - static final long DEADLINE_DELTA_MS = 1000;
  1693. -
  1694. - /** Clock to use so we can mock time in tests. */
  1695. - public interface Clock { long currentTimeMillis(); }
  1696. -
  1697. - private static Clock sClock = System::currentTimeMillis;
  1698. -
  1699. - @VisibleForTesting
  1700. - static void setClockForTesting(Clock clock) {
  1701. - sClock = clock;
  1702. - }
  1703. -
  1704. - /**
  1705. - * Checks if a task expired, based on the current time of the service.
  1706. - *
  1707. - * @param taskParams parameters sent to the service, which contain the scheduling information
  1708. - * regarding expiration.
  1709. - * @param currentTimeMs the current time of the service.
  1710. - * @return true if the task expired and false otherwise.
  1711. - */
  1712. - static boolean didTaskExpire(TaskParams taskParams, long currentTimeMs) {
  1713. - Bundle extras = taskParams.getExtras();
  1714. - if (extras == null || !extras.containsKey(BACKGROUND_TASK_SCHEDULE_TIME_KEY)) {
  1715. - return false;
  1716. - }
  1717. -
  1718. - long scheduleTimeMs = extras.getLong(BACKGROUND_TASK_SCHEDULE_TIME_KEY);
  1719. - if (extras.containsKey(BACKGROUND_TASK_END_TIME_KEY)) {
  1720. - long endTimeMs =
  1721. - extras.getLong(BackgroundTaskSchedulerDelegate.BACKGROUND_TASK_END_TIME_KEY);
  1722. - return TaskInfo.OneOffInfo.getExpirationStatus(
  1723. - scheduleTimeMs, endTimeMs, currentTimeMs);
  1724. - } else {
  1725. - long intervalTimeMs = extras.getLong(BACKGROUND_TASK_INTERVAL_TIME_KEY);
  1726. -
  1727. - // If flex is never set, it is given a default value of 10% of the period time, as
  1728. - // per the GcmNetworkManager behaviour. This default value is set in
  1729. - // https://developers.google.com/android/reference/com/google/android/gms/gcm/PeriodicTask.
  1730. - double defaultFlexAsFractionOfInterval = 0.1f;
  1731. -
  1732. - long flexTimeMs = extras.getLong(BACKGROUND_TASK_FLEX_TIME_KEY,
  1733. - /*defaultValue=*/(long) (defaultFlexAsFractionOfInterval * intervalTimeMs));
  1734. -
  1735. - return TaskInfo.PeriodicInfo.getExpirationStatus(
  1736. - scheduleTimeMs, intervalTimeMs, flexTimeMs, currentTimeMs);
  1737. - }
  1738. - }
  1739. -
  1740. - /**
  1741. - * Retrieves the {@link TaskParameters} from the {@link TaskParams}, which are passed as
  1742. - * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other
  1743. - * values are stripped at the time when the task is scheduled.
  1744. - *
  1745. - * @param taskParams the {@link TaskParams} to extract the {@link TaskParameters} from.
  1746. - * @return the {@link TaskParameters} for the current job.
  1747. - */
  1748. - static TaskParameters getTaskParametersFromTaskParams(@NonNull TaskParams taskParams) {
  1749. - int taskId;
  1750. - try {
  1751. - taskId = Integer.parseInt(taskParams.getTag());
  1752. - } catch (NumberFormatException e) {
  1753. - Log.e(TAG, "Cound not parse task ID from task tag: " + taskParams.getTag());
  1754. - return null;
  1755. - }
  1756. -
  1757. - TaskParameters.Builder builder = TaskParameters.create(taskId);
  1758. -
  1759. - Bundle extras = taskParams.getExtras();
  1760. - Bundle taskExtras = extras.getBundle(BACKGROUND_TASK_EXTRAS_KEY);
  1761. - builder.addExtras(taskExtras);
  1762. -
  1763. - return builder.build();
  1764. - }
  1765. -
  1766. - @VisibleForTesting
  1767. - static Task createTaskFromTaskInfo(@NonNull TaskInfo taskInfo) {
  1768. - Bundle taskExtras = new Bundle();
  1769. - taskExtras.putBundle(BACKGROUND_TASK_EXTRAS_KEY, taskInfo.getExtras());
  1770. -
  1771. - TaskBuilderVisitor taskBuilderVisitor = new TaskBuilderVisitor(taskExtras);
  1772. - taskInfo.getTimingInfo().accept(taskBuilderVisitor);
  1773. - Task.Builder builder = taskBuilderVisitor.getBuilder();
  1774. -
  1775. - builder.setPersisted(taskInfo.isPersisted())
  1776. - .setRequiredNetwork(getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType(
  1777. - taskInfo.getRequiredNetworkType()))
  1778. - .setRequiresCharging(taskInfo.requiresCharging())
  1779. - .setService(BackgroundTaskGcmTaskService.class)
  1780. - .setTag(taskIdToTaskTag(taskInfo.getTaskId()))
  1781. - .setUpdateCurrent(taskInfo.shouldUpdateCurrent());
  1782. -
  1783. - return builder.build();
  1784. - }
  1785. -
  1786. - private static class TaskBuilderVisitor implements TaskInfo.TimingInfoVisitor {
  1787. - private Task.Builder mBuilder;
  1788. - private final Bundle mTaskExtras;
  1789. -
  1790. - TaskBuilderVisitor(Bundle taskExtras) {
  1791. - mTaskExtras = taskExtras;
  1792. - }
  1793. -
  1794. - // Only valid after a TimingInfo object was visited.
  1795. - Task.Builder getBuilder() {
  1796. - return mBuilder;
  1797. - }
  1798. -
  1799. - @Override
  1800. - public void visit(TaskInfo.OneOffInfo oneOffInfo) {
  1801. - if (oneOffInfo.expiresAfterWindowEndTime()) {
  1802. - mTaskExtras.putLong(BACKGROUND_TASK_SCHEDULE_TIME_KEY, sClock.currentTimeMillis());
  1803. - mTaskExtras.putLong(BACKGROUND_TASK_END_TIME_KEY, oneOffInfo.getWindowEndTimeMs());
  1804. - }
  1805. -
  1806. - OneoffTask.Builder builder = new OneoffTask.Builder();
  1807. - long windowStartSeconds = oneOffInfo.hasWindowStartTimeConstraint()
  1808. - ? TimeUnit.MILLISECONDS.toSeconds(oneOffInfo.getWindowStartTimeMs())
  1809. - : 0;
  1810. - long windowEndTimeMs = oneOffInfo.getWindowEndTimeMs();
  1811. - if (oneOffInfo.expiresAfterWindowEndTime()) {
  1812. - windowEndTimeMs += DEADLINE_DELTA_MS;
  1813. - }
  1814. - builder.setExecutionWindow(
  1815. - windowStartSeconds, TimeUnit.MILLISECONDS.toSeconds(windowEndTimeMs));
  1816. - builder.setExtras(mTaskExtras);
  1817. - mBuilder = builder;
  1818. - }
  1819. -
  1820. - @Override
  1821. - public void visit(TaskInfo.PeriodicInfo periodicInfo) {
  1822. - if (periodicInfo.expiresAfterWindowEndTime()) {
  1823. - mTaskExtras.putLong(BACKGROUND_TASK_SCHEDULE_TIME_KEY, sClock.currentTimeMillis());
  1824. - mTaskExtras.putLong(
  1825. - BACKGROUND_TASK_INTERVAL_TIME_KEY, periodicInfo.getIntervalMs());
  1826. - if (periodicInfo.hasFlex()) {
  1827. - mTaskExtras.putLong(BACKGROUND_TASK_FLEX_TIME_KEY, periodicInfo.getFlexMs());
  1828. - }
  1829. - }
  1830. -
  1831. - PeriodicTask.Builder builder = new PeriodicTask.Builder();
  1832. - builder.setPeriod(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getIntervalMs()));
  1833. - if (periodicInfo.hasFlex()) {
  1834. - builder.setFlex(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getFlexMs()));
  1835. - }
  1836. - builder.setExtras(mTaskExtras);
  1837. - mBuilder = builder;
  1838. - }
  1839. -
  1840. - @Override
  1841. - public void visit(TaskInfo.ExactInfo exactInfo) {
  1842. - throw new RuntimeException("Exact tasks should not be scheduled with "
  1843. - + "GcmNetworkManager.");
  1844. - }
  1845. - }
  1846. -
  1847. - private static int getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType(
  1848. - @TaskInfo.NetworkType int networkType) {
  1849. - switch (networkType) {
  1850. - // This is correct: GcmNM ANY means no network is guaranteed.
  1851. - case TaskInfo.NetworkType.NONE:
  1852. - return Task.NETWORK_STATE_ANY;
  1853. - case TaskInfo.NetworkType.ANY:
  1854. - return Task.NETWORK_STATE_CONNECTED;
  1855. - case TaskInfo.NetworkType.UNMETERED:
  1856. - return Task.NETWORK_STATE_UNMETERED;
  1857. - default:
  1858. - assert false;
  1859. - }
  1860. - return Task.NETWORK_STATE_ANY;
  1861. - }
  1862. -
  1863. - @Override
  1864. - public boolean schedule(Context context, @NonNull TaskInfo taskInfo) {
  1865. - ThreadUtils.assertOnUiThread();
  1866. -
  1867. - GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
  1868. - if (gcmNetworkManager == null) {
  1869. - Log.e(TAG, "GcmNetworkManager is not available.");
  1870. - return false;
  1871. - }
  1872. -
  1873. - try {
  1874. - Task task = createTaskFromTaskInfo(taskInfo);
  1875. - gcmNetworkManager.schedule(task);
  1876. - } catch (IllegalArgumentException e) {
  1877. - String gcmErrorMessage = e.getMessage() == null ? "null." : e.getMessage();
  1878. - Log.e(TAG,
  1879. - "GcmNetworkManager failed to schedule task, gcm message: " + gcmErrorMessage);
  1880. - return false;
  1881. - }
  1882. -
  1883. - return true;
  1884. - }
  1885. -
  1886. - @Override
  1887. - public void cancel(Context context, int taskId) {
  1888. - ThreadUtils.assertOnUiThread();
  1889. -
  1890. - GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
  1891. - if (gcmNetworkManager == null) {
  1892. - Log.e(TAG, "GcmNetworkManager is not available.");
  1893. - return;
  1894. - }
  1895. -
  1896. - try {
  1897. - gcmNetworkManager.cancelTask(
  1898. - taskIdToTaskTag(taskId), BackgroundTaskGcmTaskService.class);
  1899. - } catch (IllegalArgumentException e) {
  1900. - Log.e(TAG, "GcmNetworkManager failed to cancel task.");
  1901. - }
  1902. - }
  1903. -
  1904. - private GcmNetworkManager getGcmNetworkManager(Context context) {
  1905. - if (ChromiumPlayServicesAvailability.isGooglePlayServicesAvailable(context)) {
  1906. - return GcmNetworkManager.getInstance(context);
  1907. - }
  1908. - return null;
  1909. - }
  1910. -
  1911. - private static String taskIdToTaskTag(int taskId) {
  1912. - return Integer.toString(taskId);
  1913. - }
  1914. -}
  1915. diff --git a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
  1916. --- a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
  1917. +++ b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
  1918. @@ -14,7 +14,6 @@ import org.chromium.components.background_task_scheduler.BackgroundTask.TaskFini
  1919. import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
  1920. import org.chromium.components.background_task_scheduler.TaskIds;
  1921. import org.chromium.components.background_task_scheduler.TaskInfo;
  1922. -import org.chromium.gms.ChromiumPlayServicesAvailability;
  1923. /** Java-side implementation of the component update scheduler using the BackgroundTaskScheduler. */
  1924. @JNINamespace("component_updater")
  1925. diff --git a/components/externalauth/android/BUILD.gn b/components/externalauth/android/BUILD.gn
  1926. --- a/components/externalauth/android/BUILD.gn
  1927. +++ b/components/externalauth/android/BUILD.gn
  1928. @@ -27,8 +27,6 @@ android_library("google_delegate_public_impl_java") {
  1929. android_library("java") {
  1930. deps = [
  1931. ":google_delegate_java",
  1932. - "$google_play_services_package:google_play_services_base_java",
  1933. - "$google_play_services_package:google_play_services_basement_java",
  1934. "//base:base_java",
  1935. "//components/embedder_support/android:util_java",
  1936. "//content/public/android:content_java",
  1937. @@ -49,7 +47,6 @@ android_library("junit") {
  1938. deps = [
  1939. ":java",
  1940. - "$google_play_services_package:google_play_services_basement_java",
  1941. "//base:base_java",
  1942. "//base:base_java_test_support",
  1943. "//base:base_junit_test_support",
  1944. diff --git a/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java b/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java
  1945. --- a/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java
  1946. +++ b/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java
  1947. @@ -15,16 +15,12 @@ import android.text.TextUtils;
  1948. import androidx.annotation.VisibleForTesting;
  1949. import androidx.annotation.WorkerThread;
  1950. -import com.google.android.gms.common.ConnectionResult;
  1951. -import com.google.android.gms.common.GoogleApiAvailability;
  1952. -
  1953. import org.chromium.base.ContextUtils;
  1954. import org.chromium.base.Log;
  1955. import org.chromium.base.StrictModeContext;
  1956. import org.chromium.base.task.PostTask;
  1957. import org.chromium.components.embedder_support.util.Origin;
  1958. import org.chromium.content_public.browser.UiThreadTaskTraits;
  1959. -import org.chromium.gms.ChromiumPlayServicesAvailability;
  1960. /**
  1961. * Utility class for external authentication tools.
  1962. @@ -170,9 +166,7 @@ public class ExternalAuthUtils {
  1963. * when it is updating.
  1964. */
  1965. public boolean isGooglePlayServicesMissing(final Context context) {
  1966. - final int resultCode = checkGooglePlayServicesAvailable(context);
  1967. - return (resultCode == ConnectionResult.SERVICE_MISSING
  1968. - || resultCode == ConnectionResult.SERVICE_INVALID);
  1969. + return true;
  1970. }
  1971. /**
  1972. @@ -189,7 +183,6 @@ public class ExternalAuthUtils {
  1973. public boolean canUseGooglePlayServices(final UserRecoverableErrorHandler errorHandler) {
  1974. Context context = ContextUtils.getApplicationContext();
  1975. final int resultCode = checkGooglePlayServicesAvailable(context);
  1976. - if (resultCode == ConnectionResult.SUCCESS) return true;
  1977. // resultCode is some kind of error.
  1978. Log.v(TAG, "Unable to use Google Play Services: %s", describeError(resultCode));
  1979. if (isUserRecoverableError(resultCode)) {
  1980. @@ -260,10 +253,7 @@ public class ExternalAuthUtils {
  1981. * @return The code produced by calling the external code
  1982. */
  1983. protected int checkGooglePlayServicesAvailable(final Context context) {
  1984. - // TODO(crbug.com/577190): Temporarily allowing disk access until more permanent fix is in.
  1985. - try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
  1986. - return ChromiumPlayServicesAvailability.getGooglePlayServicesConnectionResult(context);
  1987. - }
  1988. + return 1; /*SERVICE_MISSING*/
  1989. }
  1990. /**
  1991. @@ -274,7 +264,7 @@ public class ExternalAuthUtils {
  1992. * @return true If the code represents a user-recoverable error
  1993. */
  1994. protected boolean isUserRecoverableError(final int errorCode) {
  1995. - return GoogleApiAvailability.getInstance().isUserResolvableError(errorCode);
  1996. + return false;
  1997. }
  1998. /**
  1999. @@ -284,7 +274,7 @@ public class ExternalAuthUtils {
  2000. * @return a textual description of the error code
  2001. */
  2002. protected String describeError(final int errorCode) {
  2003. - return GoogleApiAvailability.getInstance().getErrorString(errorCode);
  2004. + return "";
  2005. }
  2006. /**
  2007. diff --git a/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java b/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java
  2008. --- a/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java
  2009. +++ b/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java
  2010. @@ -9,8 +9,6 @@ import android.app.Dialog;
  2011. import android.content.Context;
  2012. import android.content.DialogInterface;
  2013. -import com.google.android.gms.common.GoogleApiAvailability;
  2014. -
  2015. import org.chromium.base.ThreadUtils;
  2016. import org.chromium.base.metrics.RecordUserAction;
  2017. @@ -89,7 +87,6 @@ public abstract class UserRecoverableErrorHandler {
  2018. if (!sNotificationShown.getAndSet(true)) {
  2019. return;
  2020. }
  2021. - GoogleApiAvailability.getInstance().showErrorNotification(context, errorCode);
  2022. }
  2023. }
  2024. @@ -182,11 +179,7 @@ public abstract class UserRecoverableErrorHandler {
  2025. cancelDialog();
  2026. }
  2027. if (mDialog == null) {
  2028. - mDialog = GoogleApiAvailability.getInstance().getErrorDialog(
  2029. - mActivity, errorCode, NO_RESPONSE_REQUIRED);
  2030. mErrorCode = errorCode;
  2031. -
  2032. - DialogUserActionRecorder.createAndAttachToDialog(mDialog);
  2033. }
  2034. // This can happen if |errorCode| is ConnectionResult.SERVICE_INVALID.
  2035. if (mDialog != null && !mDialog.isShowing()) {
  2036. diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
  2037. --- a/components/gcm_driver/gcm_client_impl.cc
  2038. +++ b/components/gcm_driver/gcm_client_impl.cc
  2039. @@ -465,6 +465,7 @@ void GCMClientImpl::StartGCM() {
  2040. void GCMClientImpl::InitializeMCSClient() {
  2041. DCHECK(network_connection_tracker_);
  2042. + return;
  2043. std::vector<GURL> endpoints;
  2044. endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
  2045. GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
  2046. @@ -659,6 +660,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope,
  2047. int interval_ms) {
  2048. DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
  2049. DCHECK(mcs_client_);
  2050. + return;
  2051. mcs_client_->AddHeartbeatInterval(scope, interval_ms);
  2052. }
  2053. @@ -670,6 +672,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
  2054. void GCMClientImpl::StartCheckin() {
  2055. DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
  2056. + return;
  2057. // Make sure no checkin is in progress.
  2058. if (checkin_request_)
  2059. @@ -747,6 +750,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
  2060. void GCMClientImpl::SchedulePeriodicCheckin() {
  2061. DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
  2062. + return;
  2063. // Make sure no checkin is in progress.
  2064. if (checkin_request_.get() || !device_checkin_info_.accounts_set)
  2065. diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
  2066. --- a/components/gcm_driver/instance_id/android/BUILD.gn
  2067. +++ b/components/gcm_driver/instance_id/android/BUILD.gn
  2068. @@ -15,7 +15,6 @@ generate_jni("test_support_jni_headers") {
  2069. android_library("instance_id_driver_java") {
  2070. deps = [
  2071. - "$google_play_services_package:google_play_services_iid_java",
  2072. "//base:base_java",
  2073. "//components/gcm_driver/android:gcm_driver_java",
  2074. "//third_party/androidx:androidx_annotation_annotation_java",
  2075. @@ -27,14 +26,12 @@ android_library("instance_id_driver_java") {
  2076. sources = [
  2077. "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java",
  2078. - "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java",
  2079. ]
  2080. }
  2081. android_library("instance_id_driver_test_support_java") {
  2082. deps = [
  2083. ":instance_id_driver_java",
  2084. - "$google_play_services_package:google_play_services_iid_java",
  2085. "//base:base_java",
  2086. ]
  2087. diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
  2088. --- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
  2089. +++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
  2090. @@ -27,7 +27,6 @@ public class InstanceIDBridge {
  2091. * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be
  2092. * initialized on a background thread.
  2093. */
  2094. - private InstanceIDWithSubtype mInstanceID;
  2095. private static boolean sBlockOnAsyncTasksForTesting;
  2096. @@ -72,7 +71,7 @@ public class InstanceIDBridge {
  2097. new BridgeAsyncTask<String>() {
  2098. @Override
  2099. protected String doBackgroundWork() {
  2100. - return mInstanceID.getId();
  2101. + return "";
  2102. }
  2103. @Override
  2104. protected void sendResultToNative(String id) {
  2105. @@ -88,7 +87,7 @@ public class InstanceIDBridge {
  2106. new BridgeAsyncTask<Long>() {
  2107. @Override
  2108. protected Long doBackgroundWork() {
  2109. - return mInstanceID.getCreationTime();
  2110. + return 0L;
  2111. }
  2112. @Override
  2113. protected void sendResultToNative(Long creationTime) {
  2114. @@ -110,21 +109,7 @@ public class InstanceIDBridge {
  2115. new BridgeAsyncTask<String>() {
  2116. @Override
  2117. protected String doBackgroundWork() {
  2118. - try {
  2119. - // TODO(crbug.com/1247170): Migrate stored LazySubscriptionsManager data to
  2120. - // SubscriptionFlagManager.
  2121. - LazySubscriptionsManager.storeLazinessInformation(
  2122. - LazySubscriptionsManager.buildSubscriptionUniqueId(
  2123. - mSubtype, authorizedEntity),
  2124. - (flags & InstanceIDFlags.IS_LAZY) == InstanceIDFlags.IS_LAZY);
  2125. - SubscriptionFlagManager.setFlags(
  2126. - SubscriptionFlagManager.buildSubscriptionUniqueId(
  2127. - mSubtype, authorizedEntity),
  2128. - flags);
  2129. - return mInstanceID.getToken(authorizedEntity, scope);
  2130. - } catch (IOException ex) {
  2131. return "";
  2132. - }
  2133. }
  2134. @Override
  2135. protected void sendResultToNative(String token) {
  2136. @@ -141,21 +126,7 @@ public class InstanceIDBridge {
  2137. new BridgeAsyncTask<Boolean>() {
  2138. @Override
  2139. protected Boolean doBackgroundWork() {
  2140. - try {
  2141. - mInstanceID.deleteToken(authorizedEntity, scope);
  2142. - String subscriptionId = LazySubscriptionsManager.buildSubscriptionUniqueId(
  2143. - mSubtype, authorizedEntity);
  2144. - if (LazySubscriptionsManager.isSubscriptionLazy(subscriptionId)) {
  2145. - LazySubscriptionsManager.deletePersistedMessagesForSubscriptionId(
  2146. - subscriptionId);
  2147. - }
  2148. - SubscriptionFlagManager.clearFlags(
  2149. - SubscriptionFlagManager.buildSubscriptionUniqueId(
  2150. - mSubtype, authorizedEntity));
  2151. - return true;
  2152. - } catch (IOException ex) {
  2153. - return false;
  2154. - }
  2155. + return false;
  2156. }
  2157. @Override
  2158. protected void sendResultToNative(Boolean success) {
  2159. @@ -171,12 +142,7 @@ public class InstanceIDBridge {
  2160. new BridgeAsyncTask<Boolean>() {
  2161. @Override
  2162. protected Boolean doBackgroundWork() {
  2163. - try {
  2164. - mInstanceID.deleteInstanceID();
  2165. - return true;
  2166. - } catch (IOException ex) {
  2167. - return false;
  2168. - }
  2169. + return true;
  2170. }
  2171. @Override
  2172. protected void sendResultToNative(Boolean success) {
  2173. @@ -206,11 +172,6 @@ public class InstanceIDBridge {
  2174. @Override
  2175. @SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native.
  2176. protected Result doInBackground() {
  2177. - synchronized (InstanceIDBridge.this) {
  2178. - if (mInstanceID == null) {
  2179. - mInstanceID = InstanceIDWithSubtype.getInstance(mSubtype);
  2180. - }
  2181. - }
  2182. return doBackgroundWork();
  2183. }
  2184. @Override
  2185. diff --git a/components/media_router/browser/android/BUILD.gn b/components/media_router/browser/android/BUILD.gn
  2186. --- a/components/media_router/browser/android/BUILD.gn
  2187. +++ b/components/media_router/browser/android/BUILD.gn
  2188. @@ -11,10 +11,6 @@ android_library("java") {
  2189. resources_package = "org.chromium.components.media_router"
  2190. deps = [
  2191. ":java_resources",
  2192. - "$google_play_services_package:google_play_services_base_java",
  2193. - "$google_play_services_package:google_play_services_basement_java",
  2194. - "$google_play_services_package:google_play_services_cast_framework_java",
  2195. - "$google_play_services_package:google_play_services_cast_java",
  2196. "//base:base_java",
  2197. "//components/browser_ui/media/android:java",
  2198. "//content/public/android:content_java",
  2199. @@ -75,8 +71,6 @@ android_library("java") {
  2200. android_library("cast_options_provider_java") {
  2201. sources = [ "java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java" ]
  2202. deps = [
  2203. - "$google_play_services_package:google_play_services_cast_framework_java",
  2204. - "$google_play_services_package:google_play_services_cast_java",
  2205. ]
  2206. }
  2207. @@ -142,9 +136,6 @@ java_library("junit") {
  2208. deps = [
  2209. ":java",
  2210. ":test_support_java",
  2211. - "$google_play_services_package:google_play_services_basement_java",
  2212. - "$google_play_services_package:google_play_services_cast_framework_java",
  2213. - "$google_play_services_package:google_play_services_cast_java",
  2214. "//base:base_java",
  2215. "//base:base_java_test_support",
  2216. "//base:base_junit_test_support",
  2217. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java
  2218. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java
  2219. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java
  2220. @@ -10,9 +10,6 @@ import androidx.annotation.Nullable;
  2221. import androidx.annotation.VisibleForTesting;
  2222. import androidx.mediarouter.media.MediaRouter;
  2223. -import com.google.android.gms.common.ConnectionResult;
  2224. -import com.google.android.gms.common.GoogleApiAvailability;
  2225. -
  2226. import org.chromium.base.ContextUtils;
  2227. import org.chromium.base.Log;
  2228. import org.chromium.base.StrictModeContext;
  2229. @@ -42,20 +39,7 @@ public class BrowserMediaRouter implements MediaRouteManager {
  2230. new MediaRouteProvider.Factory() {
  2231. @Override
  2232. public void addProviders(MediaRouteManager manager) {
  2233. - int googleApiAvailabilityResult =
  2234. - GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
  2235. - ContextUtils.getApplicationContext(),
  2236. - MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
  2237. - if (googleApiAvailabilityResult != ConnectionResult.SUCCESS) {
  2238. - GoogleApiAvailability.getInstance().showErrorNotification(
  2239. - ContextUtils.getApplicationContext(), googleApiAvailabilityResult);
  2240. - return;
  2241. - }
  2242. - MediaRouteProvider cafProvider = CafMediaRouteProvider.create(manager);
  2243. - manager.addMediaRouteProvider(cafProvider);
  2244. - MediaRouteProvider remotingProvider =
  2245. - CafRemotingMediaRouteProvider.create(manager);
  2246. - manager.addMediaRouteProvider(remotingProvider);
  2247. + return;
  2248. }
  2249. };
  2250. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java
  2251. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java
  2252. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java
  2253. @@ -4,9 +4,6 @@
  2254. package org.chromium.components.media_router;
  2255. -import com.google.android.gms.cast.CastDevice;
  2256. -import com.google.android.gms.cast.RemoteMediaPlayer;
  2257. -
  2258. import org.chromium.components.browser_ui.media.MediaNotificationInfo;
  2259. import org.chromium.services.media_session.MediaMetadata;
  2260. @@ -18,36 +15,4 @@ public class CastSessionUtil {
  2261. // The value is borrowed from the Android Cast SDK code to match their behavior.
  2262. public static final double MIN_VOLUME_LEVEL_DELTA = 1e-7;
  2263. -
  2264. - /**
  2265. - * Builds a MediaMetadata from the given CastDevice and MediaPlayer, and sets it on the builder
  2266. - */
  2267. - public static void setNotificationMetadata(MediaNotificationInfo.Builder builder,
  2268. - CastDevice castDevice, RemoteMediaPlayer mediaPlayer) {
  2269. - MediaMetadata notificationMetadata = new MediaMetadata("", "", "");
  2270. - builder.setMetadata(notificationMetadata);
  2271. -
  2272. - if (castDevice != null) notificationMetadata.setTitle(castDevice.getFriendlyName());
  2273. -
  2274. - if (mediaPlayer == null) return;
  2275. -
  2276. - com.google.android.gms.cast.MediaInfo info = mediaPlayer.getMediaInfo();
  2277. - if (info == null) return;
  2278. -
  2279. - com.google.android.gms.cast.MediaMetadata metadata = info.getMetadata();
  2280. - if (metadata == null) return;
  2281. -
  2282. - String title = metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_TITLE);
  2283. - if (title != null) notificationMetadata.setTitle(title);
  2284. -
  2285. - String artist = metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_ARTIST);
  2286. - if (artist == null) {
  2287. - artist = metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_ALBUM_ARTIST);
  2288. - }
  2289. - if (artist != null) notificationMetadata.setArtist(artist);
  2290. -
  2291. - String album =
  2292. - metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_ALBUM_TITLE);
  2293. - if (album != null) notificationMetadata.setAlbum(album);
  2294. - }
  2295. }
  2296. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java
  2297. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java
  2298. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java
  2299. @@ -8,41 +8,24 @@ import androidx.annotation.Nullable;
  2300. import androidx.mediarouter.media.MediaRouter;
  2301. import androidx.mediarouter.media.MediaRouter.RouteInfo;
  2302. -import com.google.android.gms.cast.CastDevice;
  2303. -
  2304. /**
  2305. * A common descriptor of a device that can present some URI.
  2306. */
  2307. public class MediaSink {
  2308. private static final String CAST_SINK_URN_PREFIX = "urn:x-org.chromium:media:sink:cast-";
  2309. - private final String mId;
  2310. - private final String mName;
  2311. - private final CastDevice mDevice;
  2312. -
  2313. - /**
  2314. - * Constructor.
  2315. - * @param id A unique identifier of the sink.
  2316. - * @param name A user friendly name of the sink.
  2317. - * @param device {@link CastDevice} corresponding to this sink.
  2318. - */
  2319. - public MediaSink(String id, String name, CastDevice device) {
  2320. - mId = id;
  2321. - mName = name;
  2322. - mDevice = device;
  2323. - }
  2324. /**
  2325. * @return The unique identifier of the sink.
  2326. */
  2327. public String getId() {
  2328. - return mId;
  2329. + return "";
  2330. }
  2331. /**
  2332. * @return The user friendly name of the sink.
  2333. */
  2334. public String getName() {
  2335. - return mName;
  2336. + return "";
  2337. }
  2338. /**
  2339. @@ -52,17 +35,8 @@ public class MediaSink {
  2340. return CAST_SINK_URN_PREFIX + getId();
  2341. }
  2342. - public CastDevice getDevice() {
  2343. - return mDevice;
  2344. - }
  2345. -
  2346. @Override
  2347. public boolean equals(Object o) {
  2348. - if (o == this) return true;
  2349. - if (o instanceof MediaSink) {
  2350. - MediaSink other = (MediaSink) o;
  2351. - return mId.equals(other.getId()) && mName.equals(other.getName());
  2352. - }
  2353. return false;
  2354. }
  2355. @@ -70,23 +44,15 @@ public class MediaSink {
  2356. public int hashCode() {
  2357. final int prime = 31;
  2358. int result = 1;
  2359. - result = prime * result + ((mId == null) ? 0 : mId.hashCode());
  2360. - result = prime * result + ((mName == null) ? 0 : mName.hashCode());
  2361. return result;
  2362. }
  2363. - @Override
  2364. - public String toString() {
  2365. - return String.format("MediaSink: %s, %s", getId(), getName());
  2366. - }
  2367. -
  2368. /**
  2369. * @param route The route information provided by Android.
  2370. * @return A new MediaSink instance corresponding to the specified {@link RouteInfo}.
  2371. */
  2372. public static MediaSink fromRoute(MediaRouter.RouteInfo route) {
  2373. - return new MediaSink(
  2374. - route.getId(), route.getName(), CastDevice.getFromBundle(route.getExtras()));
  2375. + return null;
  2376. }
  2377. /**
  2378. @@ -97,10 +63,6 @@ public class MediaSink {
  2379. */
  2380. @Nullable
  2381. public static MediaSink fromSinkId(String sinkId, MediaRouter router) {
  2382. - for (MediaRouter.RouteInfo route : router.getRoutes()) {
  2383. - MediaSink sink = MediaSink.fromRoute(route);
  2384. - if (sink.getId().equals(sinkId)) return sink;
  2385. - }
  2386. return null;
  2387. }
  2388. }
  2389. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java
  2390. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java
  2391. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java
  2392. @@ -4,10 +4,6 @@
  2393. package org.chromium.components.media_router;
  2394. -import com.google.android.gms.cast.MediaInfo;
  2395. -import com.google.android.gms.cast.MediaMetadata;
  2396. -import com.google.android.gms.cast.MediaStatus;
  2397. -
  2398. import org.chromium.base.annotations.CalledByNative;
  2399. import org.chromium.base.annotations.JNINamespace;
  2400. @@ -17,11 +13,6 @@ import org.chromium.base.annotations.JNINamespace;
  2401. */
  2402. @JNINamespace("media_router")
  2403. public class MediaStatusBridge {
  2404. - private MediaStatus mStatus;
  2405. -
  2406. - public MediaStatusBridge(MediaStatus status) {
  2407. - mStatus = status;
  2408. - }
  2409. /**
  2410. * Gets the play state of the stream. Return values are defined as such:
  2411. @@ -34,7 +25,7 @@ public class MediaStatusBridge {
  2412. */
  2413. @CalledByNative
  2414. public int playerState() {
  2415. - return mStatus.getPlayerState();
  2416. + return 0;
  2417. }
  2418. /**
  2419. @@ -48,7 +39,7 @@ public class MediaStatusBridge {
  2420. */
  2421. @CalledByNative
  2422. public int idleReason() {
  2423. - return mStatus.getIdleReason();
  2424. + return 0;
  2425. }
  2426. /**
  2427. @@ -57,13 +48,7 @@ public class MediaStatusBridge {
  2428. */
  2429. @CalledByNative
  2430. public String title() {
  2431. - MediaInfo info = mStatus.getMediaInfo();
  2432. - if (info == null) return "";
  2433. -
  2434. - MediaMetadata metadata = info.getMetadata();
  2435. - if (metadata == null) return "";
  2436. -
  2437. - return metadata.getString(MediaMetadata.KEY_TITLE);
  2438. + return "";
  2439. }
  2440. /**
  2441. @@ -71,7 +56,7 @@ public class MediaStatusBridge {
  2442. */
  2443. @CalledByNative
  2444. public boolean canPlayPause() {
  2445. - return mStatus.isMediaCommandSupported(MediaStatus.COMMAND_PAUSE);
  2446. + return false;
  2447. }
  2448. /**
  2449. @@ -79,7 +64,7 @@ public class MediaStatusBridge {
  2450. */
  2451. @CalledByNative
  2452. public boolean canMute() {
  2453. - return mStatus.isMediaCommandSupported(MediaStatus.COMMAND_TOGGLE_MUTE);
  2454. + return false;
  2455. }
  2456. /**
  2457. @@ -87,7 +72,7 @@ public class MediaStatusBridge {
  2458. */
  2459. @CalledByNative
  2460. public boolean canSetVolume() {
  2461. - return mStatus.isMediaCommandSupported(MediaStatus.COMMAND_SET_VOLUME);
  2462. + return false;
  2463. }
  2464. /**
  2465. @@ -95,7 +80,7 @@ public class MediaStatusBridge {
  2466. */
  2467. @CalledByNative
  2468. public boolean canSeek() {
  2469. - return mStatus.isMediaCommandSupported(MediaStatus.COMMAND_SEEK);
  2470. + return false;
  2471. }
  2472. /**
  2473. @@ -103,7 +88,7 @@ public class MediaStatusBridge {
  2474. */
  2475. @CalledByNative
  2476. public boolean isMuted() {
  2477. - return mStatus.isMute();
  2478. + return false;
  2479. }
  2480. /**
  2481. @@ -113,7 +98,7 @@ public class MediaStatusBridge {
  2482. */
  2483. @CalledByNative
  2484. public double volume() {
  2485. - return mStatus.getStreamVolume();
  2486. + return 0.0;
  2487. }
  2488. /**
  2489. @@ -122,10 +107,7 @@ public class MediaStatusBridge {
  2490. */
  2491. @CalledByNative
  2492. public long duration() {
  2493. - MediaInfo info = mStatus.getMediaInfo();
  2494. - if (info == null) return 0;
  2495. -
  2496. - return info.getStreamDuration();
  2497. + return 0;
  2498. }
  2499. /**
  2500. @@ -133,6 +115,6 @@ public class MediaStatusBridge {
  2501. */
  2502. @CalledByNative
  2503. public long currentTime() {
  2504. - return mStatus.getStreamPosition();
  2505. + return 0;
  2506. }
  2507. }
  2508. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java
  2509. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java
  2510. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java
  2511. @@ -6,10 +6,6 @@ package org.chromium.components.media_router.caf;
  2512. import android.content.Intent;
  2513. -import com.google.android.gms.cast.CastDevice;
  2514. -import com.google.android.gms.cast.MediaStatus;
  2515. -import com.google.android.gms.cast.framework.media.RemoteMediaClient;
  2516. -
  2517. import org.chromium.components.browser_ui.media.MediaNotificationInfo;
  2518. import org.chromium.components.browser_ui.media.MediaNotificationListener;
  2519. import org.chromium.components.browser_ui.media.MediaNotificationManager;
  2520. @@ -62,20 +58,6 @@ public abstract class BaseNotificationController
  2521. public void onStatusUpdated() {
  2522. if (mNotificationBuilder == null) return;
  2523. if (!mSessionController.isConnected()) return;
  2524. -
  2525. - MediaStatus mediaStatus = mSessionController.getRemoteMediaClient().getMediaStatus();
  2526. - if (mediaStatus == null) return;
  2527. -
  2528. - int playerState = mediaStatus.getPlayerState();
  2529. - if (playerState == MediaStatus.PLAYER_STATE_PAUSED
  2530. - || playerState == MediaStatus.PLAYER_STATE_PLAYING) {
  2531. - mNotificationBuilder.setPaused(playerState != MediaStatus.PLAYER_STATE_PLAYING);
  2532. - mNotificationBuilder.setActions(
  2533. - MediaNotificationInfo.ACTION_STOP | MediaNotificationInfo.ACTION_PLAY_PAUSE);
  2534. - } else {
  2535. - mNotificationBuilder.setActions(MediaNotificationInfo.ACTION_STOP);
  2536. - }
  2537. - MediaRouterClient.getInstance().showNotification(mNotificationBuilder.build());
  2538. }
  2539. /** Called when media metadata updated. */
  2540. @@ -91,30 +73,6 @@ public abstract class BaseNotificationController
  2541. mNotificationBuilder.setMetadata(notificationMetadata);
  2542. if (!mSessionController.isConnected()) return;
  2543. -
  2544. - CastDevice castDevice = mSessionController.getSession().getCastDevice();
  2545. - if (castDevice != null) notificationMetadata.setTitle(castDevice.getFriendlyName());
  2546. -
  2547. - RemoteMediaClient remoteMediaClient = mSessionController.getRemoteMediaClient();
  2548. -
  2549. - com.google.android.gms.cast.MediaInfo info = remoteMediaClient.getMediaInfo();
  2550. - if (info == null) return;
  2551. -
  2552. - com.google.android.gms.cast.MediaMetadata metadata = info.getMetadata();
  2553. - if (metadata == null) return;
  2554. -
  2555. - String title = metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_TITLE);
  2556. - if (title != null) notificationMetadata.setTitle(title);
  2557. -
  2558. - String artist = metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_ARTIST);
  2559. - if (artist == null) {
  2560. - artist = metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_ALBUM_ARTIST);
  2561. - }
  2562. - if (artist != null) notificationMetadata.setArtist(artist);
  2563. -
  2564. - String album =
  2565. - metadata.getString(com.google.android.gms.cast.MediaMetadata.KEY_ALBUM_TITLE);
  2566. - if (album != null) notificationMetadata.setAlbum(album);
  2567. }
  2568. /////////////////////////////////////////////////////////////////////////////////////////////
  2569. @@ -122,20 +80,10 @@ public abstract class BaseNotificationController
  2570. @Override
  2571. public void onPlay(int actionSource) {
  2572. - if (!mSessionController.isConnected()) return;
  2573. -
  2574. - mSessionController.getRemoteMediaClient().play();
  2575. - MediaRouteUmaRecorder.recordCastNotificationControlsAction(
  2576. - MediaRouteUmaRecorder.CastNotificationControls.RESUME);
  2577. }
  2578. @Override
  2579. public void onPause(int actionSource) {
  2580. - if (!mSessionController.isConnected()) return;
  2581. -
  2582. - mSessionController.getRemoteMediaClient().pause();
  2583. - MediaRouteUmaRecorder.recordCastNotificationControlsAction(
  2584. - MediaRouteUmaRecorder.CastNotificationControls.PAUSE);
  2585. }
  2586. @Override
  2587. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java
  2588. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java
  2589. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java
  2590. @@ -6,12 +6,7 @@ package org.chromium.components.media_router.caf;
  2591. import androidx.annotation.Nullable;
  2592. -import com.google.android.gms.cast.CastDevice;
  2593. -import com.google.android.gms.cast.framework.CastSession;
  2594. -import com.google.android.gms.cast.framework.media.RemoteMediaClient;
  2595. -
  2596. import org.chromium.base.Log;
  2597. -import org.chromium.components.media_router.CastSessionUtil;
  2598. import org.chromium.components.media_router.FlingingController;
  2599. import org.chromium.components.media_router.MediaSink;
  2600. import org.chromium.components.media_router.MediaSource;
  2601. @@ -42,15 +37,12 @@ public abstract class BaseSessionController {
  2602. void onMetadataUpdated();
  2603. }
  2604. - private CastSession mCastSession;
  2605. private final CafBaseMediaRouteProvider mProvider;
  2606. private CreateRouteRequestInfo mRouteCreationInfo;
  2607. - private final RemoteMediaClient.Callback mRemoteMediaClientCallback;
  2608. private final List<Callback> mCallbacks = new ArrayList<>();
  2609. public BaseSessionController(CafBaseMediaRouteProvider provider) {
  2610. mProvider = provider;
  2611. - mRemoteMediaClientCallback = new RemoteMediaClientCallback();
  2612. }
  2613. public void addCallback(Callback callback) {
  2614. @@ -63,9 +55,6 @@ public abstract class BaseSessionController {
  2615. public void requestSessionLaunch() {
  2616. mRouteCreationInfo = mProvider.getPendingCreateRouteRequestInfo();
  2617. - CastUtils.getCastContext().setReceiverApplicationId(
  2618. - mRouteCreationInfo.source.getApplicationId());
  2619. -
  2620. // When the user clicks a route on the MediaRouteChooserDialog, we intercept the click event
  2621. // and do not select the route. Instead the route selection is postponed to here. This will
  2622. // trigger CAF to launch the session.
  2623. @@ -84,69 +73,22 @@ public abstract class BaseSessionController {
  2624. return mRouteCreationInfo;
  2625. }
  2626. - public CastSession getSession() {
  2627. - return mCastSession;
  2628. - }
  2629. -
  2630. - public RemoteMediaClient getRemoteMediaClient() {
  2631. - return isConnected() ? mCastSession.getRemoteMediaClient() : null;
  2632. - }
  2633. -
  2634. public abstract BaseNotificationController getNotificationController();
  2635. public void endSession() {
  2636. - CastUtils.getCastContext().getSessionManager().endCurrentSession(/* stopCasting= */ true);
  2637. - CastUtils.getCastContext().setReceiverApplicationId(null);
  2638. }
  2639. public List<String> getCapabilities() {
  2640. List<String> capabilities = new ArrayList<>();
  2641. - if (mCastSession == null || !mCastSession.isConnected()) return capabilities;
  2642. - CastDevice device = mCastSession.getCastDevice();
  2643. - if (device.hasCapability(CastDevice.CAPABILITY_AUDIO_IN)) {
  2644. - capabilities.add("audio_in");
  2645. - }
  2646. - if (device.hasCapability(CastDevice.CAPABILITY_AUDIO_OUT)) {
  2647. - capabilities.add("audio_out");
  2648. - }
  2649. - if (device.hasCapability(CastDevice.CAPABILITY_VIDEO_IN)) {
  2650. - capabilities.add("video_in");
  2651. - }
  2652. - if (device.hasCapability(CastDevice.CAPABILITY_VIDEO_OUT)) {
  2653. - capabilities.add("video_out");
  2654. - }
  2655. return capabilities;
  2656. }
  2657. public boolean isConnected() {
  2658. - return mCastSession != null && mCastSession.isConnected();
  2659. + return false;
  2660. }
  2661. private void updateRemoteMediaClient(String message) {
  2662. if (!isConnected()) return;
  2663. -
  2664. - mCastSession.getRemoteMediaClient().onMessageReceived(
  2665. - mCastSession.getCastDevice(), CastSessionUtil.MEDIA_NAMESPACE, message);
  2666. - }
  2667. -
  2668. - /** Attaches the controller to the current {@link CastSession}. */
  2669. - public void attachToCastSession(CastSession session) {
  2670. - mCastSession = session;
  2671. - RemoteMediaClient uncheckedRemoteMediaClient = mCastSession.getRemoteMediaClient();
  2672. - if (uncheckedRemoteMediaClient != null) {
  2673. - uncheckedRemoteMediaClient.registerCallback(mRemoteMediaClientCallback);
  2674. - }
  2675. - }
  2676. -
  2677. - /** Detaches the controller from any {@link CastSession}. */
  2678. - public void detachFromCastSession() {
  2679. - if (mCastSession == null) return;
  2680. -
  2681. - RemoteMediaClient uncheckedRemoteMediaClient = mCastSession.getRemoteMediaClient();
  2682. - if (uncheckedRemoteMediaClient != null) {
  2683. - uncheckedRemoteMediaClient.unregisterCallback(mRemoteMediaClientCallback);
  2684. - }
  2685. - mCastSession = null;
  2686. }
  2687. /** Called when session started. */
  2688. @@ -163,50 +105,12 @@ public abstract class BaseSessionController {
  2689. return mProvider;
  2690. }
  2691. - /**
  2692. - * All sub-classes need to register this method to listen to messages of the namespaces they are
  2693. - * interested in.
  2694. - */
  2695. - protected void onMessageReceived(CastDevice castDevice, String namespace, String message) {
  2696. - Log.d(TAG,
  2697. - "Received message from Cast device: namespace=\"" + namespace + "\" message=\""
  2698. - + message + "\"");
  2699. - if (CastSessionUtil.MEDIA_NAMESPACE.equals(namespace)) {
  2700. - updateRemoteMediaClient(message);
  2701. - }
  2702. - }
  2703. -
  2704. - private class RemoteMediaClientCallback extends RemoteMediaClient.Callback {
  2705. - @Override
  2706. - public void onStatusUpdated() {
  2707. - BaseSessionController.this.onStatusUpdated();
  2708. - }
  2709. -
  2710. - @Override
  2711. - public void onMetadataUpdated() {
  2712. - BaseSessionController.this.onMetadataUpdated();
  2713. - }
  2714. - }
  2715. -
  2716. - protected void onStatusUpdated() {
  2717. - notifyCallback((Callback callback) -> callback.onStatusUpdated());
  2718. - }
  2719. -
  2720. - protected void onMetadataUpdated() {
  2721. - notifyCallback((Callback callback) -> callback.onMetadataUpdated());
  2722. - }
  2723. -
  2724. - @Nullable
  2725. - public FlingingController getFlingingController() {
  2726. - return null;
  2727. - }
  2728. -
  2729. /**
  2730. * Helper message to get the session ID of the attached session. For stubbing in tests as
  2731. * {@link CastSession#getSessionId()} is final.
  2732. */
  2733. public String getSessionId() {
  2734. - return isConnected() ? getSession().getSessionId() : null;
  2735. + return null;
  2736. }
  2737. private void notifyCallback(NotifyCallbackAction action) {
  2738. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java
  2739. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java
  2740. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java
  2741. @@ -12,10 +12,6 @@ import androidx.mediarouter.media.MediaRouteSelector;
  2742. import androidx.mediarouter.media.MediaRouter;
  2743. import androidx.mediarouter.media.MediaRouter.RouteInfo;
  2744. -import com.google.android.gms.cast.framework.CastSession;
  2745. -import com.google.android.gms.cast.framework.SessionManagerListener;
  2746. -import com.google.android.gms.cast.framework.media.RemoteMediaClient;
  2747. -
  2748. import org.chromium.base.Log;
  2749. import org.chromium.components.media_router.DiscoveryCallback;
  2750. import org.chromium.components.media_router.DiscoveryDelegate;
  2751. @@ -39,7 +35,7 @@ import java.util.Set;
  2752. * A base provider containing common implementation for CAF-based {@link MediaRouteProvider}s.
  2753. */
  2754. public abstract class CafBaseMediaRouteProvider
  2755. - implements MediaRouteProvider, DiscoveryDelegate, SessionManagerListener<CastSession> {
  2756. + implements MediaRouteProvider, DiscoveryDelegate {
  2757. private static final String TAG = "CafMR";
  2758. protected static final List<MediaSink> NO_SINKS = Collections.emptyList();
  2759. @@ -155,7 +151,6 @@ public abstract class CafBaseMediaRouteProvider
  2760. // current session and clean up the routes (can't wait for session ending as the signal
  2761. // might be delayed).
  2762. sessionController().endSession();
  2763. - handleSessionEnd();
  2764. }
  2765. if (mPendingCreateRouteRequestInfo != null) {
  2766. cancelPendingRequest("Request replaced");
  2767. @@ -184,9 +179,6 @@ public abstract class CafBaseMediaRouteProvider
  2768. mManager.onCreateRouteRequestError("The sink does not exist", nativeRequestId);
  2769. }
  2770. - CastUtils.getCastContext().getSessionManager().addSessionManagerListener(
  2771. - this, CastSession.class);
  2772. -
  2773. mPendingCreateRouteRequestInfo = new CreateRouteRequestInfo(source, sink, presentationId,
  2774. origin, tabId, isOffTheRecord, nativeRequestId, targetRouteInfo);
  2775. @@ -213,110 +205,6 @@ public abstract class CafBaseMediaRouteProvider
  2776. removeRoute(routeId, /* error= */ null);
  2777. }
  2778. - ///////////////////////////////////////////////////////
  2779. - // SessionManagerListener implementation begin
  2780. - ///////////////////////////////////////////////////////
  2781. -
  2782. - @Override
  2783. - public final void onSessionStarting(CastSession session) {
  2784. - // The session is not connected yet at this point so this is no-op.
  2785. - }
  2786. -
  2787. - @Override
  2788. - public void onSessionStartFailed(CastSession session, int error) {
  2789. - removeAllRoutes("Launch error");
  2790. - cancelPendingRequest("Launch error");
  2791. - }
  2792. -
  2793. - @Override
  2794. - public void onSessionStarted(CastSession session, String sessionId) {
  2795. - Log.d(TAG, "onSessionStarted");
  2796. -
  2797. - if (session != CastUtils.getCastContext().getSessionManager().getCurrentCastSession()) {
  2798. - // Sometimes the session start signal might come in for an earlier launch request, which
  2799. - // should be ignored.
  2800. - return;
  2801. - }
  2802. -
  2803. - if (session == sessionController().getSession() || mPendingCreateRouteRequestInfo == null) {
  2804. - // Early return for any possible case that the session start signal comes in twice for
  2805. - // the same session.
  2806. - return;
  2807. - }
  2808. - handleSessionStart(session, sessionId);
  2809. - }
  2810. -
  2811. - @Override
  2812. - public final void onSessionResumed(CastSession session, boolean wasSuspended) {
  2813. - sessionController().attachToCastSession(session);
  2814. - }
  2815. -
  2816. - @Override
  2817. - public final void onSessionResuming(CastSession session, String sessionId) {}
  2818. -
  2819. - @Override
  2820. - public final void onSessionResumeFailed(CastSession session, int error) {}
  2821. -
  2822. - @Override
  2823. - public final void onSessionEnding(CastSession session) {
  2824. - RemoteMediaClient client = session.getRemoteMediaClient();
  2825. - if (client != null) {
  2826. - MediaRouteUmaRecorder.castEndedTimeRemaining(
  2827. - client.getApproximateStreamPosition(), client.getStreamDuration());
  2828. - }
  2829. - handleSessionEnd();
  2830. - }
  2831. -
  2832. - @Override
  2833. - public final void onSessionEnded(CastSession session, int error) {
  2834. - Log.d(TAG, "Session ended with error code " + error);
  2835. - RemoteMediaClient client = session.getRemoteMediaClient();
  2836. - if (client != null) {
  2837. - MediaRouteUmaRecorder.castEndedTimeRemaining(
  2838. - client.getApproximateStreamPosition(), client.getStreamDuration());
  2839. - }
  2840. - handleSessionEnd();
  2841. - }
  2842. -
  2843. - @Override
  2844. - public final void onSessionSuspended(CastSession session, int reason) {
  2845. - sessionController().detachFromCastSession();
  2846. - }
  2847. -
  2848. - ///////////////////////////////////////////////////////
  2849. - // SessionManagerListener implementation end
  2850. - ///////////////////////////////////////////////////////
  2851. -
  2852. - protected void handleSessionStart(CastSession session, String sessionId) {
  2853. - sessionController().attachToCastSession(session);
  2854. - sessionController().onSessionStarted();
  2855. -
  2856. - MediaSink sink = mPendingCreateRouteRequestInfo.sink;
  2857. - MediaSource source = mPendingCreateRouteRequestInfo.source;
  2858. - MediaRoute route = new MediaRoute(
  2859. - sink.getId(), source.getSourceId(), mPendingCreateRouteRequestInfo.presentationId);
  2860. - addRoute(route, mPendingCreateRouteRequestInfo.origin, mPendingCreateRouteRequestInfo.tabId,
  2861. - mPendingCreateRouteRequestInfo.nativeRequestId, /* wasLaunched= */ true);
  2862. -
  2863. - mPendingCreateRouteRequestInfo = null;
  2864. - }
  2865. -
  2866. - private void handleSessionEnd() {
  2867. - if (mPendingCreateRouteRequestInfo != null) {
  2868. - // The Cast SDK notifies about session ending when a route is unselected, even when
  2869. - // there's no current session. Because CastSessionController unselects the route to set
  2870. - // the receiver app ID, this needs to be guarded by a pending request null check to make
  2871. - // sure the listener is not unregistered during a session relaunch.
  2872. - return;
  2873. - }
  2874. - sessionController().onSessionEnded();
  2875. - sessionController().detachFromCastSession();
  2876. - getAndroidMediaRouter().selectRoute(getAndroidMediaRouter().getDefaultRoute());
  2877. - terminateAllRoutes();
  2878. - CastUtils.getCastContext().getSessionManager().removeSessionManagerListener(
  2879. - this, CastSession.class);
  2880. - }
  2881. -
  2882. private void cancelPendingRequest(String error) {
  2883. if (mPendingCreateRouteRequestInfo == null) return;
  2884. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java
  2885. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java
  2886. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java
  2887. @@ -11,8 +11,6 @@ import androidx.annotation.Nullable;
  2888. import androidx.annotation.VisibleForTesting;
  2889. import androidx.mediarouter.media.MediaRouter;
  2890. -import com.google.android.gms.cast.framework.CastSession;
  2891. -
  2892. import org.chromium.base.Log;
  2893. import org.chromium.components.media_router.BrowserMediaRouter;
  2894. import org.chromium.components.media_router.ClientRecord;
  2895. @@ -147,20 +145,6 @@ public class CafMediaRouteProvider extends CafBaseMediaRouteProvider {
  2896. return mMessageHandler;
  2897. }
  2898. - @Override
  2899. - protected void handleSessionStart(CastSession session, String sessionId) {
  2900. - super.handleSessionStart(session, sessionId);
  2901. -
  2902. - for (ClientRecord clientRecord : mClientIdToRecords.values()) {
  2903. - // Should be exactly one instance of MediaRoute/ClientRecord at this moment.
  2904. - mMessageHandler.sendReceiverActionToClient(clientRecord.routeId,
  2905. - sessionController().getSink(), clientRecord.clientId, "cast");
  2906. - }
  2907. -
  2908. - mMessageHandler.onSessionStarted();
  2909. - sessionController().getSession().getRemoteMediaClient().requestStatus();
  2910. - }
  2911. -
  2912. @Override
  2913. protected void addRoute(
  2914. MediaRoute route, String origin, int tabId, int nativeRequestId, boolean wasLaunched) {
  2915. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java
  2916. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java
  2917. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java
  2918. @@ -13,10 +13,6 @@ import android.util.SparseArray;
  2919. import androidx.annotation.VisibleForTesting;
  2920. import androidx.collection.ArrayMap;
  2921. -import com.google.android.gms.cast.ApplicationMetadata;
  2922. -import com.google.android.gms.common.api.PendingResult;
  2923. -import com.google.android.gms.common.api.Status;
  2924. -
  2925. import org.json.JSONArray;
  2926. import org.json.JSONException;
  2927. import org.json.JSONObject;
  2928. @@ -345,49 +341,7 @@ public class CafMessageHandler {
  2929. final int sequenceNumber) throws JSONException {
  2930. if (volumeMessage == null) return false;
  2931. if (!mSessionController.isConnected()) return false;
  2932. - boolean shouldWaitForVolumeChange = false;
  2933. - try {
  2934. - if (!volumeMessage.isNull("muted")) {
  2935. - boolean newMuted = volumeMessage.getBoolean("muted");
  2936. - if (mSessionController.getSession().isMute() != newMuted) {
  2937. - mSessionController.getSession().setMute(newMuted);
  2938. - shouldWaitForVolumeChange = true;
  2939. - }
  2940. - }
  2941. - if (!volumeMessage.isNull("level")) {
  2942. - double newLevel = volumeMessage.getDouble("level");
  2943. - double currentLevel = mSessionController.getSession().getVolume();
  2944. - if (!Double.isNaN(currentLevel)
  2945. - && Math.abs(currentLevel - newLevel)
  2946. - > CastSessionUtil.MIN_VOLUME_LEVEL_DELTA) {
  2947. - mSessionController.getSession().setVolume(newLevel);
  2948. - shouldWaitForVolumeChange = true;
  2949. - }
  2950. - }
  2951. - } catch (IOException | IllegalStateException e) {
  2952. - Log.e(TAG, "Failed to send volume command: " + e);
  2953. - return false;
  2954. - }
  2955. -
  2956. - // For each successful volume message we need to respond with an empty "v2_message" so the
  2957. - // Cast Web SDK can call the success callback of the page. If we expect the volume to change
  2958. - // as the result of the command, we're relying on {@link Cast.CastListener#onVolumeChanged}
  2959. - // to get called by the Android Cast SDK when the receiver status is updated. We keep the
  2960. - // sequence number until then. If the volume doesn't change as the result of the command, we
  2961. - // won't get notified by the Android SDK
  2962. - if (shouldWaitForVolumeChange) {
  2963. - mVolumeRequests.add(new RequestRecord(clientId, sequenceNumber));
  2964. - } else {
  2965. - // It's usually bad to have request and response on the same call stack so post the
  2966. - // response to the Android message loop.
  2967. - mHandler.post(new Runnable() {
  2968. - @Override
  2969. - public void run() {
  2970. - onVolumeChanged(clientId, sequenceNumber);
  2971. - }
  2972. - });
  2973. - }
  2974. - return true;
  2975. + return false;
  2976. }
  2977. @VisibleForTesting
  2978. @@ -675,19 +629,11 @@ public class CafMessageHandler {
  2979. try {
  2980. // "volume" is a part of "receiver" initialized below.
  2981. JSONObject jsonVolume = new JSONObject();
  2982. - jsonVolume.put("level", mSessionController.getSession().getVolume());
  2983. - jsonVolume.put("muted", mSessionController.getSession().isMute());
  2984. // "receiver" is a part of "message" initialized below.
  2985. JSONObject jsonReceiver = new JSONObject();
  2986. - jsonReceiver.put(
  2987. - "label", mSessionController.getSession().getCastDevice().getDeviceId());
  2988. - jsonReceiver.put("friendlyName",
  2989. - mSessionController.getSession().getCastDevice().getFriendlyName());
  2990. jsonReceiver.put("capabilities", toJSONArray(mSessionController.getCapabilities()));
  2991. jsonReceiver.put("volume", jsonVolume);
  2992. - jsonReceiver.put(
  2993. - "isActiveInput", mSessionController.getSession().getActiveInputState());
  2994. jsonReceiver.put("displayStatus", null);
  2995. jsonReceiver.put("receiverType", "cast");
  2996. @@ -700,23 +646,14 @@ public class CafMessageHandler {
  2997. JSONObject jsonMessage = new JSONObject();
  2998. jsonMessage.put("sessionId", mSessionController.getSessionId());
  2999. - jsonMessage.put("statusText", mSessionController.getSession().getApplicationStatus());
  3000. jsonMessage.put("receiver", jsonReceiver);
  3001. jsonMessage.put("namespaces", jsonNamespaces);
  3002. jsonMessage.put("media", toJSONArray(new ArrayList<>()));
  3003. jsonMessage.put("status", "connected");
  3004. jsonMessage.put("transportId", "web-4");
  3005. - ApplicationMetadata applicationMetadata =
  3006. - mSessionController.getSession().getApplicationMetadata();
  3007. - if (applicationMetadata != null) {
  3008. - jsonMessage.put("appId", applicationMetadata.getApplicationId());
  3009. - } else {
  3010. - jsonMessage.put("appId",
  3011. - mSessionController.getRouteCreationInfo().source.getApplicationId());
  3012. - }
  3013. - jsonMessage.put("displayName",
  3014. - mSessionController.getSession().getCastDevice().getFriendlyName());
  3015. + jsonMessage.put("appId",
  3016. + mSessionController.getRouteCreationInfo().source.getApplicationId());
  3017. return jsonMessage.toString();
  3018. } catch (JSONException e) {
  3019. @@ -797,32 +734,6 @@ public class CafMessageHandler {
  3020. boolean sendStringCastMessage(
  3021. String message, String namespace, String clientId, int sequenceNumber) {
  3022. if (!mSessionController.isConnected()) return false;
  3023. -
  3024. - PendingResult<Status> pendingResult =
  3025. - mSessionController.getSession().sendMessage(namespace, message);
  3026. - if (!TextUtils.equals(namespace, CastSessionUtil.MEDIA_NAMESPACE)) {
  3027. - // Media commands wait for the media status update as a result.
  3028. - pendingResult.setResultCallback(
  3029. - (Status result) -> onSendAppMessageResult(result, clientId, sequenceNumber));
  3030. - }
  3031. - return true;
  3032. - }
  3033. -
  3034. - /**
  3035. - * Notifies a client that an app message has been sent.
  3036. - * @param clientId The client id the message is sent from.
  3037. - * @param sequenceNumber The sequence number of the message.
  3038. - */
  3039. - void onSendAppMessageResult(Status result, String clientId, int sequenceNumber) {
  3040. - if (!result.isSuccess()) {
  3041. - // TODO(avayvod): should actually report back to the page.
  3042. - // See https://crbug.com/550445.
  3043. - Log.e(TAG, "Failed to send the message: " + result);
  3044. - return;
  3045. - }
  3046. -
  3047. - // App messages wait for the empty message with the sequence
  3048. - // number.
  3049. - sendEnclosedMessageToClient(clientId, "app_message", null, sequenceNumber);
  3050. + return false;
  3051. }
  3052. }
  3053. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java
  3054. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java
  3055. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java
  3056. @@ -9,8 +9,6 @@ import android.net.Uri;
  3057. import androidx.annotation.Nullable;
  3058. import androidx.mediarouter.media.MediaRouteSelector;
  3059. -import com.google.android.gms.cast.CastMediaControlIntent;
  3060. -
  3061. import org.chromium.components.media_router.MediaSource;
  3062. import java.util.Arrays;
  3063. @@ -106,13 +104,7 @@ public class CastMediaSource implements MediaSource {
  3064. */
  3065. @Override
  3066. public MediaRouteSelector buildRouteSelector() {
  3067. - try {
  3068. - return new MediaRouteSelector.Builder()
  3069. - .addControlCategory(CastMediaControlIntent.categoryForCast(mApplicationId))
  3070. - .build();
  3071. - } catch (IllegalArgumentException e) {
  3072. - return null;
  3073. - }
  3074. + return null;
  3075. }
  3076. /**
  3077. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java
  3078. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java
  3079. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java
  3080. @@ -6,28 +6,8 @@ package org.chromium.components.media_router.caf;
  3081. import android.content.Context;
  3082. -import com.google.android.gms.cast.LaunchOptions;
  3083. -import com.google.android.gms.cast.framework.CastOptions;
  3084. -import com.google.android.gms.cast.framework.OptionsProvider;
  3085. -import com.google.android.gms.cast.framework.SessionProvider;
  3086. -
  3087. import java.util.List;
  3088. /** {@link OptionsProvider} implementation for Chrome MR. */
  3089. -public class CastOptionsProvider implements OptionsProvider {
  3090. - @Override
  3091. - public CastOptions getCastOptions(Context context) {
  3092. - return new CastOptions.Builder()
  3093. - .setCastMediaOptions(null)
  3094. - .setEnableReconnectionService(false)
  3095. - .setLaunchOptions(new LaunchOptions.Builder().setRelaunchIfRunning(true).build())
  3096. - .setResumeSavedSession(false)
  3097. - .setStopReceiverApplicationWhenEndingSession(true)
  3098. - .build();
  3099. - }
  3100. -
  3101. - @Override
  3102. - public List<SessionProvider> getAdditionalSessionProviders(Context context) {
  3103. - return null;
  3104. - }
  3105. +public class CastOptionsProvider {
  3106. }
  3107. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java
  3108. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java
  3109. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java
  3110. @@ -7,11 +7,6 @@ package org.chromium.components.media_router.caf;
  3111. import androidx.annotation.NonNull;
  3112. import androidx.annotation.VisibleForTesting;
  3113. -import com.google.android.gms.cast.ApplicationMetadata;
  3114. -import com.google.android.gms.cast.Cast;
  3115. -import com.google.android.gms.cast.CastDevice;
  3116. -import com.google.android.gms.cast.framework.CastSession;
  3117. -
  3118. import org.chromium.base.Log;
  3119. import java.util.ArrayList;
  3120. @@ -24,12 +19,10 @@ public class CastSessionController extends BaseSessionController {
  3121. private static final String TAG = "CafSessionCtrl";
  3122. private List<String> mNamespaces = new ArrayList<String>();
  3123. - private CastListener mCastListener;
  3124. private CafNotificationController mNotificationController;
  3125. public CastSessionController(CafBaseMediaRouteProvider provider) {
  3126. super(provider);
  3127. - mCastListener = new CastListener();
  3128. mNotificationController = new CafNotificationController(this);
  3129. }
  3130. @@ -37,30 +30,6 @@ public class CastSessionController extends BaseSessionController {
  3131. return mNamespaces;
  3132. }
  3133. - /**
  3134. - * Init nested fields for testing. The reason is that nested classes are bound to the original
  3135. - * instance instead of the spyed instance.
  3136. - */
  3137. - void initNestedFieldsForTesting() {
  3138. - mCastListener = new CastListener();
  3139. - }
  3140. -
  3141. - @Override
  3142. - public void attachToCastSession(CastSession session) {
  3143. - super.attachToCastSession(session);
  3144. - getSession().addCastListener(mCastListener);
  3145. - updateNamespaces();
  3146. - }
  3147. -
  3148. - @Override
  3149. - public void detachFromCastSession() {
  3150. - if (getSession() == null) return;
  3151. -
  3152. - mNamespaces.clear();
  3153. - getSession().removeCastListener(mCastListener);
  3154. - super.detachFromCastSession();
  3155. - }
  3156. -
  3157. @Override
  3158. public void onSessionEnded() {
  3159. getMessageHandler().onSessionEnded();
  3160. @@ -72,24 +41,6 @@ public class CastSessionController extends BaseSessionController {
  3161. return mNotificationController;
  3162. }
  3163. - private class CastListener extends Cast.Listener {
  3164. - @Override
  3165. - public void onApplicationStatusChanged() {
  3166. - CastSessionController.this.onApplicationStatusChanged();
  3167. - }
  3168. -
  3169. - @Override
  3170. - public void onApplicationMetadataChanged(ApplicationMetadata metadata) {
  3171. - CastSessionController.this.onApplicationStatusChanged();
  3172. - }
  3173. -
  3174. - @Override
  3175. - public void onVolumeChanged() {
  3176. - CastSessionController.this.onApplicationStatusChanged();
  3177. - getMessageHandler().onVolumeChanged();
  3178. - }
  3179. - }
  3180. -
  3181. private void onApplicationStatusChanged() {
  3182. updateNamespaces();
  3183. @@ -100,53 +51,18 @@ public class CastSessionController extends BaseSessionController {
  3184. @VisibleForTesting
  3185. void updateNamespaces() {
  3186. if (!isConnected()) return;
  3187. -
  3188. - if (getSession().getApplicationMetadata() == null
  3189. - || getSession().getApplicationMetadata().getSupportedNamespaces() == null) {
  3190. - return;
  3191. - }
  3192. -
  3193. - Set<String> namespacesToAdd =
  3194. - new HashSet<>(getSession().getApplicationMetadata().getSupportedNamespaces());
  3195. - Set<String> namespacesToRemove = new HashSet<String>(mNamespaces);
  3196. -
  3197. - namespacesToRemove.removeAll(namespacesToAdd);
  3198. - namespacesToAdd.removeAll(mNamespaces);
  3199. -
  3200. - for (String namespace : namespacesToRemove) unregisterNamespace(namespace);
  3201. - for (String namespace : namespacesToAdd) registerNamespace(namespace);
  3202. }
  3203. private void registerNamespace(String namespace) {
  3204. assert !mNamespaces.contains(namespace);
  3205. if (!isConnected()) return;
  3206. -
  3207. - try {
  3208. - getSession().setMessageReceivedCallbacks(namespace, this::onMessageReceived);
  3209. - mNamespaces.add(namespace);
  3210. - } catch (Exception e) {
  3211. - Log.e(TAG, "Failed to register namespace listener for %s", namespace, e);
  3212. - }
  3213. }
  3214. private void unregisterNamespace(String namespace) {
  3215. assert mNamespaces.contains(namespace);
  3216. if (!isConnected()) return;
  3217. -
  3218. - try {
  3219. - getSession().removeMessageReceivedCallbacks(namespace);
  3220. - mNamespaces.remove(namespace);
  3221. - } catch (Exception e) {
  3222. - Log.e(TAG, "Failed to remove the namespace listener for %s", namespace, e);
  3223. - }
  3224. - }
  3225. -
  3226. - @Override
  3227. - protected void onMessageReceived(CastDevice castDevice, String namespace, String message) {
  3228. - super.onMessageReceived(castDevice, namespace, message);
  3229. - getMessageHandler().onMessageReceived(namespace, message);
  3230. }
  3231. @NonNull
  3232. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java
  3233. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java
  3234. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java
  3235. @@ -4,18 +4,10 @@
  3236. package org.chromium.components.media_router.caf;
  3237. -import com.google.android.gms.cast.framework.CastContext;
  3238. -
  3239. import org.chromium.components.media_router.MediaRouterClient;
  3240. /** Utility methods for Cast. */
  3241. public class CastUtils {
  3242. - /** Helper method to return the {@link CastContext} instance. */
  3243. - public static CastContext getCastContext() {
  3244. - return CastContext.getSharedInstance(
  3245. - MediaRouterClient.getInstance().getContextForRemoting());
  3246. - }
  3247. -
  3248. /**
  3249. * Compares two origins. Empty origin strings correspond to unique origins in
  3250. * url::Origin.
  3251. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java
  3252. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java
  3253. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java
  3254. @@ -45,60 +45,35 @@ public class CafExpandedControllerActivity
  3255. private MediaController.Delegate mControllerDelegate = new MediaController.Delegate() {
  3256. @Override
  3257. public void play() {
  3258. - if (!mSessionController.isConnected()) return;
  3259. -
  3260. - mSessionController.getSession().getRemoteMediaClient().play();
  3261. - MediaRouteUmaRecorder.recordFullscreenControlsAction(
  3262. - MediaRouteUmaRecorder.FullScreenControls.RESUME);
  3263. }
  3264. @Override
  3265. public void pause() {
  3266. - if (!mSessionController.isConnected()) return;
  3267. -
  3268. - mSessionController.getSession().getRemoteMediaClient().pause();
  3269. - MediaRouteUmaRecorder.recordFullscreenControlsAction(
  3270. - MediaRouteUmaRecorder.FullScreenControls.PAUSE);
  3271. }
  3272. @Override
  3273. public long getDuration() {
  3274. - if (!mSessionController.isConnected()) return 0;
  3275. - return mSessionController.getFlingingController().getDuration();
  3276. + return 0;
  3277. }
  3278. @Override
  3279. public long getPosition() {
  3280. - if (!mSessionController.isConnected()) return 0;
  3281. - return mSessionController.getFlingingController().getApproximateCurrentTime();
  3282. + return 0;
  3283. }
  3284. @Override
  3285. public void seekTo(long pos) {
  3286. - if (!mSessionController.isConnected()) return;
  3287. -
  3288. - mSessionController.getSession().getRemoteMediaClient().seek(pos);
  3289. - MediaRouteUmaRecorder.recordFullscreenControlsAction(
  3290. - MediaRouteUmaRecorder.FullScreenControls.SEEK);
  3291. }
  3292. @Override
  3293. public boolean isPlaying() {
  3294. - if (!mSessionController.isConnected()) return false;
  3295. -
  3296. - return mSessionController.getSession().getRemoteMediaClient().isPlaying();
  3297. + return false;
  3298. }
  3299. @Override
  3300. public long getActionFlags() {
  3301. long flags =
  3302. PlaybackStateCompat.ACTION_REWIND | PlaybackStateCompat.ACTION_FAST_FORWARD;
  3303. - if (mSessionController.isConnected()
  3304. - && mSessionController.getSession().getRemoteMediaClient().isPlaying()) {
  3305. - flags |= PlaybackStateCompat.ACTION_PAUSE;
  3306. - } else {
  3307. - flags |= PlaybackStateCompat.ACTION_PLAY;
  3308. - }
  3309. return flags;
  3310. }
  3311. };
  3312. @@ -187,20 +162,10 @@ public class CafExpandedControllerActivity
  3313. private void updateUi() {
  3314. if (!mSessionController.isConnected()) return;
  3315. - String deviceName = mSessionController.getSession().getCastDevice().getFriendlyName();
  3316. - String titleText = "";
  3317. - if (deviceName != null) {
  3318. - titleText = getResources().getString(R.string.cast_casting_video, deviceName);
  3319. - }
  3320. - mTitleView.setText(titleText);
  3321. -
  3322. mMediaController.refresh();
  3323. mMediaController.updateProgress();
  3324. cancelProgressUpdateTask();
  3325. - if (mSessionController.getSession().getRemoteMediaClient().isPlaying()) {
  3326. - scheduleProgressUpdateTask();
  3327. - }
  3328. }
  3329. private void scheduleProgressUpdateTask() {
  3330. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java
  3331. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java
  3332. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java
  3333. @@ -49,9 +49,6 @@ public class CafRemotingMediaRouteProvider extends CafBaseMediaRouteProvider {
  3334. @Override
  3335. public void detachRoute(String routeId) {
  3336. super.detachRoute(routeId);
  3337. - MediaRouteUmaRecorder.recordRemoteSessionTimeWithoutMediaElementPercentage(
  3338. - mSessionController.getFlingingController().getApproximateCurrentTime(),
  3339. - mSessionController.getFlingingController().getDuration());
  3340. }
  3341. @Override
  3342. @@ -74,6 +71,6 @@ public class CafRemotingMediaRouteProvider extends CafBaseMediaRouteProvider {
  3343. if (!mRoutes.containsKey(routeId)) return null;
  3344. - return sessionController().getFlingingController();
  3345. + return null;
  3346. }
  3347. }
  3348. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java
  3349. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java
  3350. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java
  3351. @@ -4,11 +4,6 @@
  3352. package org.chromium.components.media_router.caf.remoting;
  3353. -import com.google.android.gms.cast.MediaInfo;
  3354. -import com.google.android.gms.cast.MediaStatus;
  3355. -import com.google.android.gms.cast.framework.media.RemoteMediaClient;
  3356. -import com.google.android.gms.common.api.Result;
  3357. -
  3358. import org.chromium.base.Log;
  3359. import org.chromium.components.media_router.FlingingController;
  3360. import org.chromium.components.media_router.MediaController;
  3361. @@ -69,14 +64,6 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
  3362. /** Starts loading the media URL, from the given position. */
  3363. public void load(long position) {
  3364. if (!mSessionController.isConnected()) return;
  3365. -
  3366. - mLoaded = true;
  3367. -
  3368. - MediaInfo mediaInfo = new MediaInfo.Builder(mMediaUrl)
  3369. - .setContentType("*/*")
  3370. - .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
  3371. - .build();
  3372. - mSessionController.getRemoteMediaClient().load(mediaInfo, /* autoplay= */ true, position);
  3373. }
  3374. ////////////////////////////////////////////
  3375. @@ -91,89 +78,28 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
  3376. load(/* position= */ 0);
  3377. return;
  3378. }
  3379. -
  3380. - mSessionController.getRemoteMediaClient().play().setResultCallback(
  3381. - this::onMediaCommandResult);
  3382. }
  3383. @Override
  3384. public void pause() {
  3385. if (!mSessionController.isConnected()) return;
  3386. - mSessionController.getRemoteMediaClient().pause().setResultCallback(
  3387. - this::onMediaCommandResult);
  3388. }
  3389. @Override
  3390. public void setMute(boolean mute) {
  3391. if (!mSessionController.isConnected()) return;
  3392. - mSessionController.getRemoteMediaClient().setStreamMute(mute).setResultCallback(
  3393. - this::onMediaCommandResult);
  3394. }
  3395. @Override
  3396. public void setVolume(double volume) {
  3397. if (!mSessionController.isConnected()) return;
  3398. - mSessionController.getRemoteMediaClient().setStreamVolume(volume).setResultCallback(
  3399. - this::onMediaCommandResult);
  3400. }
  3401. @Override
  3402. public void seek(long position) {
  3403. - if (!mSessionController.isConnected()) return;
  3404. -
  3405. - if (!mLoaded) {
  3406. - load(position);
  3407. - return;
  3408. - }
  3409. -
  3410. - mSessionController.getRemoteMediaClient().seek(position).setResultCallback(
  3411. - this::onMediaCommandResult);
  3412. - mStreamPositionExtrapolator.onSeek(position);
  3413. }
  3414. ////////////////////////////////////////////
  3415. // MediaController implementation end
  3416. ////////////////////////////////////////////
  3417. -
  3418. - public void onStatusUpdated() {
  3419. - if (mMediaStatusObserver == null) return;
  3420. -
  3421. - RemoteMediaClient remoteMediaClient = mSessionController.getRemoteMediaClient();
  3422. -
  3423. - MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
  3424. - if (mediaStatus != null) {
  3425. - mHasEverReceivedValidMediaSession = true;
  3426. - if (mediaStatus.getPlayerState() == MediaStatus.PLAYER_STATE_IDLE
  3427. - && mediaStatus.getIdleReason() == MediaStatus.IDLE_REASON_FINISHED) {
  3428. - mLoaded = false;
  3429. - mStreamPositionExtrapolator.onFinish();
  3430. - } else {
  3431. - mStreamPositionExtrapolator.update(remoteMediaClient.getStreamDuration(),
  3432. - remoteMediaClient.getApproximateStreamPosition(),
  3433. - remoteMediaClient.isPlaying(), mediaStatus.getPlaybackRate());
  3434. - }
  3435. -
  3436. - mMediaStatusObserver.onMediaStatusUpdate(new MediaStatusBridge(mediaStatus));
  3437. -
  3438. - } else if (mHasEverReceivedValidMediaSession) {
  3439. - // We can receive a null |mediaStatus| while we are in the process of loading the video.
  3440. - // We should wait until we receive one valid media status before considering the video
  3441. - // unloaded. Otherwise, the first call to seek or play will reload the video.
  3442. - // See b/144325733.
  3443. - mLoaded = false;
  3444. - mStreamPositionExtrapolator.clear();
  3445. - }
  3446. - }
  3447. -
  3448. - private void onMediaCommandResult(Result result) {
  3449. - // When multiple API calls are made in quick succession, "Results have already been set"
  3450. - // IllegalStateExceptions might be thrown from GMS code. We prefer to catch the exception
  3451. - // and noop it, than to crash. This might lead to some API calls never getting their
  3452. - // onResult() called, so we should not rely on onResult() being called for every API call.
  3453. - // See https://crbug.com/853923.
  3454. - if (!result.getStatus().isSuccess()) {
  3455. - Log.e(TAG, "Error when sending command. Status code: %d",
  3456. - result.getStatus().getStatusCode());
  3457. - }
  3458. - }
  3459. }
  3460. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java
  3461. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java
  3462. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java
  3463. @@ -13,8 +13,6 @@ import android.util.Base64;
  3464. import androidx.annotation.Nullable;
  3465. import androidx.mediarouter.media.MediaRouteSelector;
  3466. -import com.google.android.gms.cast.CastMediaControlIntent;
  3467. -
  3468. import org.chromium.base.ContextUtils;
  3469. import org.chromium.base.Log;
  3470. import org.chromium.components.media_router.MediaSource;
  3471. @@ -84,9 +82,7 @@ public class RemotingMediaSource implements MediaSource {
  3472. */
  3473. @Override
  3474. public MediaRouteSelector buildRouteSelector() {
  3475. - return new MediaRouteSelector.Builder()
  3476. - .addControlCategory(CastMediaControlIntent.categoryForCast(getApplicationId()))
  3477. - .build();
  3478. + return null;
  3479. }
  3480. /**
  3481. @@ -113,7 +109,7 @@ public class RemotingMediaSource implements MediaSource {
  3482. sApplicationId = (customAppId != null && !customAppId.isEmpty())
  3483. ? customAppId
  3484. - : CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID;
  3485. + : "CC1AD845"; /*DEFAULT_MEDIA_RECEIVER_APPLICATION_ID*/
  3486. }
  3487. return sApplicationId;
  3488. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java
  3489. --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java
  3490. +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java
  3491. @@ -4,8 +4,6 @@
  3492. package org.chromium.components.media_router.caf.remoting;
  3493. -import com.google.android.gms.cast.framework.CastSession;
  3494. -
  3495. import org.chromium.base.Log;
  3496. import org.chromium.components.media_router.CastSessionUtil;
  3497. import org.chromium.components.media_router.caf.BaseNotificationController;
  3498. @@ -33,19 +31,6 @@ public class RemotingSessionController extends BaseSessionController {
  3499. sInstance = new WeakReference<>(this);
  3500. }
  3501. - @Override
  3502. - public void attachToCastSession(CastSession session) {
  3503. - super.attachToCastSession(session);
  3504. -
  3505. - try {
  3506. - getSession().setMessageReceivedCallbacks(
  3507. - CastSessionUtil.MEDIA_NAMESPACE, this::onMessageReceived);
  3508. - } catch (Exception e) {
  3509. - Log.e(TAG, "Failed to register namespace listener for %s",
  3510. - CastSessionUtil.MEDIA_NAMESPACE, e);
  3511. - }
  3512. - }
  3513. -
  3514. @Override
  3515. public void onSessionStarted() {
  3516. super.onSessionStarted();
  3517. @@ -53,17 +38,6 @@ public class RemotingSessionController extends BaseSessionController {
  3518. mFlingingControllerAdapter = new FlingingControllerAdapter(this, source.getMediaUrl());
  3519. }
  3520. - @Override
  3521. - protected void onStatusUpdated() {
  3522. - mFlingingControllerAdapter.onStatusUpdated();
  3523. - super.onStatusUpdated();
  3524. - }
  3525. -
  3526. - @Override
  3527. - public FlingingControllerAdapter getFlingingController() {
  3528. - return mFlingingControllerAdapter;
  3529. - }
  3530. -
  3531. @Override
  3532. public BaseNotificationController getNotificationController() {
  3533. return mNotificationController;
  3534. diff --git a/components/media_router/test/android/cast_emulator/BUILD.gn b/components/media_router/test/android/cast_emulator/BUILD.gn
  3535. --- a/components/media_router/test/android/cast_emulator/BUILD.gn
  3536. +++ b/components/media_router/test/android/cast_emulator/BUILD.gn
  3537. @@ -20,7 +20,6 @@ android_library("cast_emulator_java") {
  3538. "src/org/chromium/components/media_router/cast_emulator/router/DummyRoutePublisher.java",
  3539. ]
  3540. deps = [
  3541. - "$google_play_services_package:google_play_services_cast_java",
  3542. "//base:base_java",
  3543. "//third_party/android_deps:android_support_v7_appcompat_java",
  3544. "//third_party/androidx:androidx_mediarouter_mediarouter_java",
  3545. diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
  3546. --- a/components/module_installer/android/BUILD.gn
  3547. +++ b/components/module_installer/android/BUILD.gn
  3548. @@ -34,7 +34,6 @@ android_library("module_installer_java") {
  3549. deps = [
  3550. "//base:base_java",
  3551. "//components/crash/android:java",
  3552. - "//third_party/android_deps:com_google_android_play_core_java",
  3553. "//third_party/androidx:androidx_annotation_annotation_java",
  3554. ]
  3555. @@ -58,7 +57,6 @@ junit_binary("module_installer_junit_tests") {
  3556. "//base:base_java",
  3557. "//base:base_java_test_support",
  3558. "//base:base_junit_test_support",
  3559. - "//third_party/android_deps:com_google_android_play_core_java",
  3560. "//third_party/hamcrest:hamcrest_java",
  3561. ]
  3562. }
  3563. diff --git a/components/signin/public/android/BUILD.gn b/components/signin/public/android/BUILD.gn
  3564. --- a/components/signin/public/android/BUILD.gn
  3565. +++ b/components/signin/public/android/BUILD.gn
  3566. @@ -2,8 +2,6 @@ import("//build/config/android/rules.gni")
  3567. android_library("java") {
  3568. deps = [
  3569. - "$google_play_services_package:google_play_services_auth_base_java",
  3570. - "$google_play_services_package:google_play_services_base_java",
  3571. "//base:base_java",
  3572. "//components/externalauth/android:java",
  3573. "//net/android:net_java",
  3574. @@ -24,7 +22,6 @@ android_library("java") {
  3575. "java/src/org/chromium/components/signin/AccountManagerFacade.java",
  3576. "java/src/org/chromium/components/signin/AccountManagerFacadeImpl.java",
  3577. "java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java",
  3578. - "java/src/org/chromium/components/signin/AccountRenameChecker.java",
  3579. "java/src/org/chromium/components/signin/AccountRestrictionPatternReceiver.java",
  3580. "java/src/org/chromium/components/signin/AccountUtils.java",
  3581. "java/src/org/chromium/components/signin/AccountsChangeObserver.java",
  3582. @@ -136,7 +133,6 @@ java_library("junit") {
  3583. deps = [
  3584. ":java",
  3585. ":signin_java_test_support",
  3586. - "$google_play_services_package:google_play_services_auth_base_java",
  3587. "//base:base_java",
  3588. "//base:base_java_test_support",
  3589. "//base:base_junit_test_support",
  3590. diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/BUILD.gn
  3591. --- a/components/webauthn/android/BUILD.gn
  3592. +++ b/components/webauthn/android/BUILD.gn
  3593. @@ -15,9 +15,6 @@ android_library("java") {
  3594. sources = [
  3595. "java/src/org/chromium/components/webauthn/AuthenticatorFactory.java",
  3596. "java/src/org/chromium/components/webauthn/AuthenticatorImpl.java",
  3597. - "java/src/org/chromium/components/webauthn/Fido2ApiHandler.java",
  3598. - "java/src/org/chromium/components/webauthn/Fido2CredentialRequest.java",
  3599. - "java/src/org/chromium/components/webauthn/Fido2Helper.java",
  3600. "java/src/org/chromium/components/webauthn/FidoErrorResponseCallback.java",
  3601. "java/src/org/chromium/components/webauthn/GetAssertionResponseCallback.java",
  3602. "java/src/org/chromium/components/webauthn/InternalAuthenticator.java",
  3603. @@ -26,8 +23,6 @@ android_library("java") {
  3604. ]
  3605. annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
  3606. deps = [
  3607. - "$google_play_services_package:google_play_services_fido_java",
  3608. - "$google_play_services_package:google_play_services_tasks_java",
  3609. "//base:base_java",
  3610. "//base:jni_java",
  3611. "//components/externalauth/android:java",
  3612. diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
  3613. --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
  3614. +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
  3615. @@ -95,17 +95,7 @@ public class AuthenticatorImpl implements Authenticator {
  3616. mMakeCredentialCallback = callback;
  3617. mIsOperationPending = true;
  3618. - Context context = ContextUtils.getApplicationContext();
  3619. - if (PackageUtils.getPackageVersion(context, GMSCORE_PACKAGE_NAME)
  3620. - < Fido2ApiHandler.GMSCORE_MIN_VERSION) {
  3621. - onError(AuthenticatorStatus.NOT_IMPLEMENTED);
  3622. - return;
  3623. - }
  3624. -
  3625. - Fido2ApiHandler.getInstance().makeCredential(options, mRenderFrameHost, mOrigin,
  3626. - (status, response)
  3627. - -> onRegisterResponse(status, response),
  3628. - status -> onError(status));
  3629. + onError(AuthenticatorStatus.NOT_IMPLEMENTED);
  3630. }
  3631. @Override
  3632. @@ -118,16 +108,7 @@ public class AuthenticatorImpl implements Authenticator {
  3633. mGetAssertionCallback = callback;
  3634. mIsOperationPending = true;
  3635. - Context context = ContextUtils.getApplicationContext();
  3636. -
  3637. - if (PackageUtils.getPackageVersion(context, GMSCORE_PACKAGE_NAME)
  3638. - < Fido2ApiHandler.GMSCORE_MIN_VERSION) {
  3639. - onError(AuthenticatorStatus.NOT_IMPLEMENTED);
  3640. - return;
  3641. - }
  3642. -
  3643. - Fido2ApiHandler.getInstance().getAssertion(options, mRenderFrameHost, mOrigin, mPayment,
  3644. - (status, response) -> onSignResponse(status, response), status -> onError(status));
  3645. + onError(AuthenticatorStatus.NOT_IMPLEMENTED);
  3646. }
  3647. @Override
  3648. @@ -152,16 +133,8 @@ public class AuthenticatorImpl implements Authenticator {
  3649. return;
  3650. }
  3651. - if (PackageUtils.getPackageVersion(context, GMSCORE_PACKAGE_NAME)
  3652. - < Fido2ApiHandler.GMSCORE_MIN_VERSION) {
  3653. decoratedCallback.call(false);
  3654. return;
  3655. - }
  3656. -
  3657. - mIsUserVerifyingPlatformAuthenticatorAvailableCallbackQueue.add(decoratedCallback);
  3658. - Fido2ApiHandler.getInstance().isUserVerifyingPlatformAuthenticatorAvailable(
  3659. - mRenderFrameHost,
  3660. - isUvpaa -> onIsUserVerifyingPlatformAuthenticatorAvailableResponse(isUvpaa));
  3661. }
  3662. @Override
  3663. diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc
  3664. --- a/content/browser/push_messaging/push_messaging_manager.cc
  3665. +++ b/content/browser/push_messaging/push_messaging_manager.cc
  3666. @@ -755,7 +755,7 @@ void PushMessagingManager::GetSubscriptionInfo(
  3667. }
  3668. PushMessagingService* PushMessagingManager::GetService() {
  3669. - return render_process_host_.GetBrowserContext()->GetPushMessagingService();
  3670. + return nullptr;
  3671. }
  3672. } // namespace content
  3673. diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
  3674. --- a/content/public/android/BUILD.gn
  3675. +++ b/content/public/android/BUILD.gn
  3676. @@ -136,10 +136,6 @@ android_library("content_main_dex_java") {
  3677. android_library("content_full_java") {
  3678. deps = [
  3679. ":content_main_dex_java",
  3680. - "$google_play_services_package:google_play_services_auth_api_phone_java",
  3681. - "$google_play_services_package:google_play_services_base_java",
  3682. - "$google_play_services_package:google_play_services_basement_java",
  3683. - "$google_play_services_package:google_play_services_tasks_java",
  3684. "//base:base_java",
  3685. "//build:chromeos_buildflags",
  3686. "//components/download/public/common:public_java",
  3687. diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
  3688. --- a/content/public/common/content_features.cc
  3689. +++ b/content/public/common/content_features.cc
  3690. @@ -939,7 +939,7 @@ const base::Feature kWebAssemblyTrapHandler {
  3691. // Controls whether the WebAuthentication API is enabled:
  3692. // https://w3c.github.io/webauthn
  3693. const base::Feature kWebAuth{"WebAuthentication",
  3694. - base::FEATURE_ENABLED_BY_DEFAULT};
  3695. + base::FEATURE_DISABLED_BY_DEFAULT};
  3696. // Controls whether WebAuthn assertion transport is enabled.
  3697. const base::Feature kWebAuthAuthenticatorAttachment{
  3698. diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
  3699. --- a/content/test/BUILD.gn
  3700. +++ b/content/test/BUILD.gn
  3701. @@ -2869,10 +2869,6 @@ if (is_android) {
  3702. testonly = true
  3703. sources = content_java_sources_needing_jni
  3704. deps = [
  3705. - "$google_play_services_package:google_play_services_auth_api_phone_java",
  3706. - "$google_play_services_package:google_play_services_base_java",
  3707. - "$google_play_services_package:google_play_services_basement_java",
  3708. - "$google_play_services_package:google_play_services_tasks_java",
  3709. "//base:base_java",
  3710. "//content/public/android:content_java",
  3711. "//ui/android:ui_full_java",
  3712. diff --git a/device/BUILD.gn b/device/BUILD.gn
  3713. --- a/device/BUILD.gn
  3714. +++ b/device/BUILD.gn
  3715. @@ -446,9 +446,6 @@ if (is_android) {
  3716. "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java",
  3717. ]
  3718. deps = [
  3719. - "$google_play_services_package:google_play_services_base_java",
  3720. - "$google_play_services_package:google_play_services_basement_java",
  3721. - "$google_play_services_package:google_play_services_location_java",
  3722. "//base:base_java",
  3723. "//base:base_java_test_support",
  3724. "//base:base_junit_test_support",
  3725. diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
  3726. --- a/remoting/android/client_java_tmpl.gni
  3727. +++ b/remoting/android/client_java_tmpl.gni
  3728. @@ -104,9 +104,6 @@ template("remoting_android_client_java_tmpl") {
  3729. if (defined(invoker.play_services_package)) {
  3730. deps += [
  3731. - "${invoker.play_services_package}:google_play_services_auth_base_java",
  3732. - "${invoker.play_services_package}:google_play_services_base_java",
  3733. - "${invoker.play_services_package}:google_play_services_basement_java",
  3734. ]
  3735. }
  3736. diff --git a/services/BUILD.gn b/services/BUILD.gn
  3737. --- a/services/BUILD.gn
  3738. +++ b/services/BUILD.gn
  3739. @@ -110,11 +110,6 @@ if (is_android) {
  3740. "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
  3741. ]
  3742. deps = [
  3743. - "$google_play_services_package:google_play_services_base_java",
  3744. - "$google_play_services_package:google_play_services_basement_java",
  3745. - "$google_play_services_package:google_play_services_location_java",
  3746. - "$google_play_services_package:google_play_services_vision_common_java",
  3747. - "$google_play_services_package:google_play_services_vision_java",
  3748. "//base:base_java",
  3749. "//base:base_java_test_support",
  3750. "//base:base_junit_test_support",
  3751. @@ -143,10 +138,6 @@ if (is_android) {
  3752. "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
  3753. ]
  3754. deps = [
  3755. - "$google_play_services_package:google_play_services_base_java",
  3756. - "$google_play_services_package:google_play_services_basement_java",
  3757. - "$google_play_services_package:google_play_services_vision_common_java",
  3758. - "$google_play_services_package:google_play_services_vision_java",
  3759. "//base:base_java",
  3760. "//base:base_java_test_support",
  3761. "//mojo/public/java:base_java",
  3762. diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
  3763. --- a/services/device/geolocation/BUILD.gn
  3764. +++ b/services/device/geolocation/BUILD.gn
  3765. @@ -163,9 +163,6 @@ if (is_android) {
  3766. deps = [
  3767. ":geolocation_jni_headers",
  3768. - "$google_play_services_package:google_play_services_base_java",
  3769. - "$google_play_services_package:google_play_services_basement_java",
  3770. - "$google_play_services_package:google_play_services_location_java",
  3771. "//base:base_java",
  3772. "//components/location/android:location_java",
  3773. "//services/device/public/java:geolocation_java",
  3774. diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
  3775. --- a/services/shape_detection/BUILD.gn
  3776. +++ b/services/shape_detection/BUILD.gn
  3777. @@ -107,10 +107,6 @@ if (is_android) {
  3778. ]
  3779. deps = [
  3780. - "$google_play_services_package:google_play_services_base_java",
  3781. - "$google_play_services_package:google_play_services_basement_java",
  3782. - "$google_play_services_package:google_play_services_vision_common_java",
  3783. - "$google_play_services_package:google_play_services_vision_java",
  3784. "//base:base_java",
  3785. "//mojo/public/java:base_java",
  3786. "//mojo/public/java:bindings_java",
  3787. diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
  3788. --- a/third_party/android_deps/BUILD.gn
  3789. +++ b/third_party/android_deps/BUILD.gn
  3790. @@ -68,7 +68,6 @@ if (!limit_android_deps) {
  3791. ":org_robolectric_shadowapi_java",
  3792. ":org_robolectric_shadows_framework_java",
  3793. ":org_robolectric_shadows_multidex_java",
  3794. - ":org_robolectric_shadows_playservices_java",
  3795. ":org_robolectric_utils_java",
  3796. ":org_robolectric_utils_reflector_java",
  3797. @@ -93,7 +92,7 @@ if (!limit_android_deps) {
  3798. android_library("chromium_play_services_availability_java") {
  3799. sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ]
  3800. - deps = [ "$google_play_services_package:google_play_services_base_java" ]
  3801. + deps = [ ]
  3802. }
  3803. android_library("chromium_play_services_availability_shadows_java") {
  3804. @@ -1030,210 +1029,6 @@ if (!limit_android_deps) {
  3805. resource_overlay = true
  3806. }
  3807. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3808. - android_aar_prebuilt("google_play_services_auth_java") {
  3809. - aar_path = "libs/com_google_android_gms_play_services_auth/play-services-auth-17.0.0.aar"
  3810. - info_path = "libs/com_google_android_gms_play_services_auth/com_google_android_gms_play_services_auth.info"
  3811. - deps = [
  3812. - ":google_play_services_auth_api_phone_java",
  3813. - ":google_play_services_auth_base_java",
  3814. - ":google_play_services_base_java",
  3815. - ":google_play_services_basement_java",
  3816. - ":google_play_services_tasks_java",
  3817. - "//third_party/androidx:androidx_fragment_fragment_java",
  3818. - "//third_party/androidx:androidx_loader_loader_java",
  3819. - ]
  3820. - }
  3821. -
  3822. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3823. - android_aar_prebuilt("google_play_services_auth_api_phone_java") {
  3824. - aar_path = "libs/com_google_android_gms_play_services_auth_api_phone/play-services-auth-api-phone-17.5.0.aar"
  3825. - info_path = "libs/com_google_android_gms_play_services_auth_api_phone/com_google_android_gms_play_services_auth_api_phone.info"
  3826. - deps = [
  3827. - ":google_play_services_base_java",
  3828. - ":google_play_services_basement_java",
  3829. - ":google_play_services_tasks_java",
  3830. - ]
  3831. - }
  3832. -
  3833. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3834. - android_aar_prebuilt("google_play_services_auth_base_java") {
  3835. - aar_path = "libs/com_google_android_gms_play_services_auth_base/play-services-auth-base-17.0.0.aar"
  3836. - info_path = "libs/com_google_android_gms_play_services_auth_base/com_google_android_gms_play_services_auth_base.info"
  3837. - deps = [
  3838. - ":google_play_services_base_java",
  3839. - ":google_play_services_basement_java",
  3840. - ":google_play_services_tasks_java",
  3841. - "//third_party/androidx:androidx_collection_collection_java",
  3842. - ]
  3843. - }
  3844. -
  3845. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3846. - android_aar_prebuilt("google_play_services_base_java") {
  3847. - aar_path = "libs/com_google_android_gms_play_services_base/play-services-base-17.5.0.aar"
  3848. - info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
  3849. - deps = [
  3850. - ":google_play_services_basement_java",
  3851. - ":google_play_services_tasks_java",
  3852. - "//third_party/androidx:androidx_collection_collection_java",
  3853. - "//third_party/androidx:androidx_core_core_java",
  3854. - "//third_party/androidx:androidx_fragment_fragment_java",
  3855. - ]
  3856. - bytecode_rewriter_target =
  3857. - "//build/android/bytecode:fragment_activity_replacer"
  3858. - }
  3859. -
  3860. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3861. - android_aar_prebuilt("google_play_services_basement_java") {
  3862. - aar_path = "libs/com_google_android_gms_play_services_basement/play-services-basement-17.5.0.aar"
  3863. - info_path = "libs/com_google_android_gms_play_services_basement/com_google_android_gms_play_services_basement.info"
  3864. - deps = [
  3865. - "//third_party/androidx:androidx_collection_collection_java",
  3866. - "//third_party/androidx:androidx_core_core_java",
  3867. - "//third_party/androidx:androidx_fragment_fragment_java",
  3868. - ]
  3869. -
  3870. - jar_excluded_patterns = []
  3871. - if (!enable_java_asserts) {
  3872. - # Omit the file since we use our own copy.
  3873. - jar_excluded_patterns +=
  3874. - [ "com/google/android/gms/common/internal/Preconditions.class" ]
  3875. - deps += [ "//third_party/android_deps/local_modifications/preconditions:gms_stub_preconditions_java" ]
  3876. - }
  3877. -
  3878. - # https://crbug.com/989505
  3879. - jar_excluded_patterns += [ "META-INF/proguard/*" ]
  3880. - input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
  3881. - bytecode_rewriter_target =
  3882. - "//build/android/bytecode:fragment_activity_replacer"
  3883. - }
  3884. -
  3885. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3886. - android_aar_prebuilt("google_play_services_cast_java") {
  3887. - aar_path = "libs/com_google_android_gms_play_services_cast/play-services-cast-17.0.0.aar"
  3888. - info_path = "libs/com_google_android_gms_play_services_cast/com_google_android_gms_play_services_cast.info"
  3889. - deps = [
  3890. - ":google_play_services_base_java",
  3891. - ":google_play_services_basement_java",
  3892. - ":google_play_services_flags_java",
  3893. - ":google_play_services_tasks_java",
  3894. - "//third_party/androidx:androidx_core_core_java",
  3895. - "//third_party/androidx:androidx_mediarouter_mediarouter_java",
  3896. - ]
  3897. - }
  3898. -
  3899. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3900. - android_aar_prebuilt("google_play_services_cast_framework_java") {
  3901. - aar_path = "libs/com_google_android_gms_play_services_cast_framework/play-services-cast-framework-17.0.0.aar"
  3902. - info_path = "libs/com_google_android_gms_play_services_cast_framework/com_google_android_gms_play_services_cast_framework.info"
  3903. - deps = [
  3904. - ":google_play_services_base_java",
  3905. - ":google_play_services_basement_java",
  3906. - ":google_play_services_cast_java",
  3907. - "//third_party/androidx:androidx_appcompat_appcompat_java",
  3908. - "//third_party/androidx:androidx_collection_collection_java",
  3909. - "//third_party/androidx:androidx_core_core_java",
  3910. - "//third_party/androidx:androidx_fragment_fragment_java",
  3911. - "//third_party/androidx:androidx_media_media_java",
  3912. - "//third_party/androidx:androidx_mediarouter_mediarouter_java",
  3913. - "//third_party/androidx:androidx_recyclerview_recyclerview_java",
  3914. - ]
  3915. - }
  3916. -
  3917. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3918. - android_aar_prebuilt("google_play_services_fido_java") {
  3919. - aar_path = "libs/com_google_android_gms_play_services_fido/play-services-fido-19.0.0-beta.aar"
  3920. - info_path = "libs/com_google_android_gms_play_services_fido/com_google_android_gms_play_services_fido.info"
  3921. - deps = [
  3922. - ":google_play_services_base_java",
  3923. - ":google_play_services_basement_java",
  3924. - ":google_play_services_tasks_java",
  3925. - ]
  3926. - }
  3927. -
  3928. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3929. - android_aar_prebuilt("google_play_services_gcm_java") {
  3930. - aar_path = "libs/com_google_android_gms_play_services_gcm/play-services-gcm-17.0.0.aar"
  3931. - info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
  3932. - deps = [
  3933. - ":google_play_services_base_java",
  3934. - ":google_play_services_basement_java",
  3935. - ":google_play_services_iid_java",
  3936. - ":google_play_services_stats_java",
  3937. - "//third_party/androidx:androidx_collection_collection_java",
  3938. - "//third_party/androidx:androidx_core_core_java",
  3939. - "//third_party/androidx:androidx_legacy_legacy_support_core_utils_java",
  3940. - ]
  3941. - }
  3942. -
  3943. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3944. - android_aar_prebuilt("google_play_services_iid_java") {
  3945. - aar_path = "libs/com_google_android_gms_play_services_iid/play-services-iid-17.0.0.aar"
  3946. - info_path = "libs/com_google_android_gms_play_services_iid/com_google_android_gms_play_services_iid.info"
  3947. - deps = [
  3948. - ":google_play_services_base_java",
  3949. - ":google_play_services_basement_java",
  3950. - ":google_play_services_stats_java",
  3951. - ":google_play_services_tasks_java",
  3952. - "//third_party/androidx:androidx_collection_collection_java",
  3953. - "//third_party/androidx:androidx_core_core_java",
  3954. - ]
  3955. - }
  3956. -
  3957. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3958. - android_aar_prebuilt("google_play_services_instantapps_java") {
  3959. - aar_path = "libs/com_google_android_gms_play_services_instantapps/play-services-instantapps-17.0.0.aar"
  3960. - info_path = "libs/com_google_android_gms_play_services_instantapps/com_google_android_gms_play_services_instantapps.info"
  3961. - deps = [
  3962. - ":google_play_services_base_java",
  3963. - ":google_play_services_basement_java",
  3964. - ":google_play_services_tasks_java",
  3965. - ]
  3966. - }
  3967. -
  3968. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3969. - android_aar_prebuilt("google_play_services_location_java") {
  3970. - aar_path = "libs/com_google_android_gms_play_services_location/play-services-location-17.0.0.aar"
  3971. - info_path = "libs/com_google_android_gms_play_services_location/com_google_android_gms_play_services_location.info"
  3972. - deps = [
  3973. - ":google_play_services_base_java",
  3974. - ":google_play_services_basement_java",
  3975. - ":google_play_services_places_placereport_java",
  3976. - ":google_play_services_tasks_java",
  3977. - ]
  3978. - }
  3979. -
  3980. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3981. - android_aar_prebuilt("google_play_services_tasks_java") {
  3982. - aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-17.2.0.aar"
  3983. - info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
  3984. - deps = [ ":google_play_services_basement_java" ]
  3985. - }
  3986. -
  3987. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3988. - android_aar_prebuilt("google_play_services_vision_java") {
  3989. - aar_path = "libs/com_google_android_gms_play_services_vision/play-services-vision-18.0.0.aar"
  3990. - info_path = "libs/com_google_android_gms_play_services_vision/com_google_android_gms_play_services_vision.info"
  3991. - deps = [
  3992. - ":google_play_services_base_java",
  3993. - ":google_play_services_basement_java",
  3994. - ":google_play_services_vision_common_java",
  3995. - ]
  3996. - }
  3997. -
  3998. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  3999. - android_aar_prebuilt("google_play_services_vision_common_java") {
  4000. - aar_path = "libs/com_google_android_gms_play_services_vision_common/play-services-vision-common-18.0.0.aar"
  4001. - info_path = "libs/com_google_android_gms_play_services_vision_common/com_google_android_gms_play_services_vision_common.info"
  4002. - deps = [
  4003. - ":google_play_services_base_java",
  4004. - ":google_play_services_basement_java",
  4005. - ":google_play_services_clearcut_java",
  4006. - ":google_play_services_flags_java",
  4007. - ":google_play_services_phenotype_java",
  4008. - ]
  4009. - }
  4010. -
  4011. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4012. android_aar_prebuilt("com_google_android_material_material_java") {
  4013. aar_path =
  4014. @@ -1267,60 +1062,6 @@ if (!limit_android_deps) {
  4015. ignore_proguard_configs = true
  4016. }
  4017. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4018. - android_aar_prebuilt("com_google_android_play_core_java") {
  4019. - aar_path = "libs/com_google_android_play_core/core-1.10.0.aar"
  4020. - info_path =
  4021. - "libs/com_google_android_play_core/com_google_android_play_core.info"
  4022. - }
  4023. -
  4024. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4025. - android_aar_prebuilt("google_firebase_firebase_iid_java") {
  4026. - aar_path = "libs/com_google_firebase_firebase_iid/firebase-iid-21.0.1.aar"
  4027. - info_path = "libs/com_google_firebase_firebase_iid/com_google_firebase_firebase_iid.info"
  4028. - deps = [
  4029. - ":google_firebase_firebase_common_java",
  4030. - ":google_firebase_firebase_components_java",
  4031. - ":google_firebase_firebase_iid_interop_java",
  4032. - ":google_firebase_firebase_installations_interop_java",
  4033. - ":google_firebase_firebase_installations_java",
  4034. - ":google_play_services_basement_java",
  4035. - ":google_play_services_cloud_messaging_java",
  4036. - ":google_play_services_stats_java",
  4037. - ":google_play_services_tasks_java",
  4038. - "//third_party/androidx:androidx_collection_collection_java",
  4039. - "//third_party/androidx:androidx_core_core_java",
  4040. - "//third_party/androidx:androidx_legacy_legacy_support_core_utils_java",
  4041. - ]
  4042. - }
  4043. -
  4044. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4045. - android_aar_prebuilt("google_firebase_firebase_messaging_java") {
  4046. - aar_path = "libs/com_google_firebase_firebase_messaging/firebase-messaging-21.0.1.aar"
  4047. - info_path = "libs/com_google_firebase_firebase_messaging/com_google_firebase_firebase_messaging.info"
  4048. - deps = [
  4049. - ":google_android_datatransport_transport_api_java",
  4050. - ":google_firebase_firebase_common_java",
  4051. - ":google_firebase_firebase_components_java",
  4052. - ":google_firebase_firebase_encoders_java",
  4053. - ":google_firebase_firebase_encoders_json_java",
  4054. - ":google_firebase_firebase_iid_java",
  4055. - ":google_firebase_firebase_installations_interop_java",
  4056. - ":google_firebase_firebase_installations_java",
  4057. - ":google_firebase_firebase_measurement_connector_java",
  4058. - ":google_play_services_basement_java",
  4059. - ":google_play_services_cloud_messaging_java",
  4060. - ":google_play_services_stats_java",
  4061. - ":google_play_services_tasks_java",
  4062. - "//third_party/androidx:androidx_collection_collection_java",
  4063. - "//third_party/androidx:androidx_core_core_java",
  4064. - ]
  4065. -
  4066. - # We removed the datatransport dependency to reduce binary size.
  4067. - # The library works without it as it's only used for logging.
  4068. - enable_bytecode_checks = false
  4069. - }
  4070. -
  4071. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4072. java_prebuilt("com_google_guava_guava_android_java") {
  4073. jar_path = "libs/com_google_guava_guava_android/guava-31.0-android.jar"
  4074. @@ -1458,19 +1199,6 @@ if (!limit_android_deps) {
  4075. bypass_platform_checks = true
  4076. }
  4077. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4078. - java_prebuilt("org_robolectric_shadows_playservices_java") {
  4079. - jar_path = "libs/org_robolectric_shadows_playservices/shadows-playservices-4.3.1.jar"
  4080. - output_name = "org_robolectric_shadows_playservices"
  4081. - enable_bytecode_checks = false
  4082. - testonly = true
  4083. - deps = [
  4084. - ":com_google_guava_guava_java",
  4085. - ":org_robolectric_annotations_java",
  4086. - ]
  4087. - bypass_platform_checks = true
  4088. - }
  4089. -
  4090. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4091. java_prebuilt("org_robolectric_utils_java") {
  4092. jar_path = "libs/org_robolectric_utils/utils-4.3.1.jar"
  4093. @@ -1847,272 +1575,6 @@ if (!limit_android_deps) {
  4094. deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
  4095. }
  4096. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4097. - android_aar_prebuilt("google_play_services_clearcut_java") {
  4098. - aar_path = "libs/com_google_android_gms_play_services_clearcut/play-services-clearcut-17.0.0.aar"
  4099. - info_path = "libs/com_google_android_gms_play_services_clearcut/com_google_android_gms_play_services_clearcut.info"
  4100. -
  4101. - # To remove visibility constraint, add this dependency to
  4102. - # //third_party/android_deps/build.gradle.
  4103. - visibility = [
  4104. - ":*",
  4105. - "//third_party/androidx:*",
  4106. - ]
  4107. - deps = [
  4108. - ":google_play_services_base_java",
  4109. - ":google_play_services_basement_java",
  4110. - ":google_play_services_phenotype_java",
  4111. - ":google_play_services_tasks_java",
  4112. - "//third_party/androidx:androidx_core_core_java",
  4113. - ]
  4114. - }
  4115. -
  4116. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4117. - android_aar_prebuilt("google_play_services_cloud_messaging_java") {
  4118. - aar_path = "libs/com_google_android_gms_play_services_cloud_messaging/play-services-cloud-messaging-16.0.0.aar"
  4119. - info_path = "libs/com_google_android_gms_play_services_cloud_messaging/com_google_android_gms_play_services_cloud_messaging.info"
  4120. -
  4121. - # To remove visibility constraint, add this dependency to
  4122. - # //third_party/android_deps/build.gradle.
  4123. - visibility = [
  4124. - ":*",
  4125. - "//third_party/androidx:*",
  4126. - ]
  4127. - deps = [
  4128. - ":google_play_services_basement_java",
  4129. - ":google_play_services_tasks_java",
  4130. - ]
  4131. - }
  4132. -
  4133. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4134. - android_aar_prebuilt("google_play_services_flags_java") {
  4135. - aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-17.0.0.aar"
  4136. - info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
  4137. -
  4138. - # To remove visibility constraint, add this dependency to
  4139. - # //third_party/android_deps/build.gradle.
  4140. - visibility = [
  4141. - ":*",
  4142. - "//third_party/androidx:*",
  4143. - ]
  4144. - deps = [
  4145. - ":google_play_services_base_java",
  4146. - ":google_play_services_basement_java",
  4147. - ]
  4148. - }
  4149. -
  4150. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4151. - android_aar_prebuilt("google_play_services_phenotype_java") {
  4152. - aar_path = "libs/com_google_android_gms_play_services_phenotype/play-services-phenotype-17.0.0.aar"
  4153. - info_path = "libs/com_google_android_gms_play_services_phenotype/com_google_android_gms_play_services_phenotype.info"
  4154. -
  4155. - # To remove visibility constraint, add this dependency to
  4156. - # //third_party/android_deps/build.gradle.
  4157. - visibility = [
  4158. - ":*",
  4159. - "//third_party/androidx:*",
  4160. - ]
  4161. - deps = [
  4162. - ":google_play_services_base_java",
  4163. - ":google_play_services_basement_java",
  4164. - ":google_play_services_tasks_java",
  4165. - "//third_party/androidx:androidx_core_core_java",
  4166. - ]
  4167. - }
  4168. -
  4169. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4170. - android_aar_prebuilt("google_play_services_places_placereport_java") {
  4171. - aar_path = "libs/com_google_android_gms_play_services_places_placereport/play-services-places-placereport-17.0.0.aar"
  4172. - info_path = "libs/com_google_android_gms_play_services_places_placereport/com_google_android_gms_play_services_places_placereport.info"
  4173. -
  4174. - # To remove visibility constraint, add this dependency to
  4175. - # //third_party/android_deps/build.gradle.
  4176. - visibility = [
  4177. - ":*",
  4178. - "//third_party/androidx:*",
  4179. - ]
  4180. - deps = [ ":google_play_services_basement_java" ]
  4181. - }
  4182. -
  4183. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4184. - android_aar_prebuilt("google_play_services_stats_java") {
  4185. - aar_path = "libs/com_google_android_gms_play_services_stats/play-services-stats-17.0.0.aar"
  4186. - info_path = "libs/com_google_android_gms_play_services_stats/com_google_android_gms_play_services_stats.info"
  4187. -
  4188. - # To remove visibility constraint, add this dependency to
  4189. - # //third_party/android_deps/build.gradle.
  4190. - visibility = [
  4191. - ":*",
  4192. - "//third_party/androidx:*",
  4193. - ]
  4194. - deps = [
  4195. - ":google_play_services_basement_java",
  4196. - "//third_party/androidx:androidx_legacy_legacy_support_core_utils_java",
  4197. - ]
  4198. - }
  4199. -
  4200. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4201. - java_prebuilt("google_firebase_firebase_annotations_java") {
  4202. - jar_path = "libs/com_google_firebase_firebase_annotations/firebase-annotations-16.0.0.jar"
  4203. - output_name = "com_google_firebase_firebase_annotations"
  4204. - supports_android = true
  4205. -
  4206. - # To remove visibility constraint, add this dependency to
  4207. - # //third_party/android_deps/build.gradle.
  4208. - visibility = [
  4209. - ":*",
  4210. - "//third_party/androidx:*",
  4211. - ]
  4212. - }
  4213. -
  4214. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4215. - android_aar_prebuilt("google_firebase_firebase_common_java") {
  4216. - aar_path =
  4217. - "libs/com_google_firebase_firebase_common/firebase-common-19.5.0.aar"
  4218. - info_path = "libs/com_google_firebase_firebase_common/com_google_firebase_firebase_common.info"
  4219. -
  4220. - # To remove visibility constraint, add this dependency to
  4221. - # //third_party/android_deps/build.gradle.
  4222. - visibility = [
  4223. - ":*",
  4224. - "//third_party/androidx:*",
  4225. - ]
  4226. - deps = [
  4227. - ":google_firebase_firebase_components_java",
  4228. - ":google_play_services_basement_java",
  4229. - ":google_play_services_tasks_java",
  4230. - ]
  4231. -
  4232. - # Ignore missing kotlin.KotlinVersion definition in
  4233. - # com.google.firebase.platforminfo.KotlinDetector.
  4234. - enable_bytecode_checks = false
  4235. - }
  4236. -
  4237. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4238. - android_aar_prebuilt("google_firebase_firebase_components_java") {
  4239. - aar_path = "libs/com_google_firebase_firebase_components/firebase-components-16.1.0.aar"
  4240. - info_path = "libs/com_google_firebase_firebase_components/com_google_firebase_firebase_components.info"
  4241. -
  4242. - # To remove visibility constraint, add this dependency to
  4243. - # //third_party/android_deps/build.gradle.
  4244. - visibility = [
  4245. - ":*",
  4246. - "//third_party/androidx:*",
  4247. - ]
  4248. - deps = [
  4249. - ":google_firebase_firebase_annotations_java",
  4250. - "//third_party/androidx:androidx_annotation_annotation_java",
  4251. - ]
  4252. -
  4253. - # Can't find com.google.firebase.components.Component$ComponentType.
  4254. - enable_bytecode_checks = false
  4255. - }
  4256. -
  4257. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4258. - java_prebuilt("google_firebase_firebase_encoders_java") {
  4259. - jar_path = "libs/com_google_firebase_firebase_encoders/firebase-encoders-16.1.0.jar"
  4260. - output_name = "com_google_firebase_firebase_encoders"
  4261. - supports_android = true
  4262. -
  4263. - # To remove visibility constraint, add this dependency to
  4264. - # //third_party/android_deps/build.gradle.
  4265. - visibility = [
  4266. - ":*",
  4267. - "//third_party/androidx:*",
  4268. - ]
  4269. - deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
  4270. - }
  4271. -
  4272. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4273. - android_aar_prebuilt("google_firebase_firebase_encoders_json_java") {
  4274. - aar_path = "libs/com_google_firebase_firebase_encoders_json/firebase-encoders-json-17.1.0.aar"
  4275. - info_path = "libs/com_google_firebase_firebase_encoders_json/com_google_firebase_firebase_encoders_json.info"
  4276. -
  4277. - # To remove visibility constraint, add this dependency to
  4278. - # //third_party/android_deps/build.gradle.
  4279. - visibility = [
  4280. - ":*",
  4281. - "//third_party/androidx:*",
  4282. - ]
  4283. - deps = [
  4284. - ":google_firebase_firebase_encoders_java",
  4285. - "//third_party/androidx:androidx_annotation_annotation_java",
  4286. - ]
  4287. - }
  4288. -
  4289. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4290. - android_aar_prebuilt("google_firebase_firebase_iid_interop_java") {
  4291. - aar_path = "libs/com_google_firebase_firebase_iid_interop/firebase-iid-interop-17.0.0.aar"
  4292. - info_path = "libs/com_google_firebase_firebase_iid_interop/com_google_firebase_firebase_iid_interop.info"
  4293. -
  4294. - # To remove visibility constraint, add this dependency to
  4295. - # //third_party/android_deps/build.gradle.
  4296. - visibility = [
  4297. - ":*",
  4298. - "//third_party/androidx:*",
  4299. - ]
  4300. - deps = [
  4301. - ":google_play_services_base_java",
  4302. - ":google_play_services_basement_java",
  4303. - ]
  4304. - }
  4305. -
  4306. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4307. - android_aar_prebuilt("google_firebase_firebase_installations_java") {
  4308. - aar_path = "libs/com_google_firebase_firebase_installations/firebase-installations-16.3.5.aar"
  4309. - info_path = "libs/com_google_firebase_firebase_installations/com_google_firebase_firebase_installations.info"
  4310. -
  4311. - # To remove visibility constraint, add this dependency to
  4312. - # //third_party/android_deps/build.gradle.
  4313. - visibility = [
  4314. - ":*",
  4315. - "//third_party/androidx:*",
  4316. - ]
  4317. - deps = [
  4318. - ":google_firebase_firebase_common_java",
  4319. - ":google_firebase_firebase_components_java",
  4320. - ":google_firebase_firebase_installations_interop_java",
  4321. - ":google_play_services_tasks_java",
  4322. - ]
  4323. -
  4324. - # Can't find com.google.auto.value.AutoValue$Builder.
  4325. - enable_bytecode_checks = false
  4326. - }
  4327. -
  4328. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4329. - android_aar_prebuilt("google_firebase_firebase_installations_interop_java") {
  4330. - aar_path = "libs/com_google_firebase_firebase_installations_interop/firebase-installations-interop-16.0.1.aar"
  4331. - info_path = "libs/com_google_firebase_firebase_installations_interop/com_google_firebase_firebase_installations_interop.info"
  4332. -
  4333. - # To remove visibility constraint, add this dependency to
  4334. - # //third_party/android_deps/build.gradle.
  4335. - visibility = [
  4336. - ":*",
  4337. - "//third_party/androidx:*",
  4338. - ]
  4339. - deps = [
  4340. - ":google_firebase_firebase_annotations_java",
  4341. - ":google_play_services_tasks_java",
  4342. - ]
  4343. -
  4344. - # Can't find com.google.auto.value.AutoValue$Builder.
  4345. - enable_bytecode_checks = false
  4346. - }
  4347. -
  4348. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4349. - android_aar_prebuilt("google_firebase_firebase_measurement_connector_java") {
  4350. - aar_path = "libs/com_google_firebase_firebase_measurement_connector/firebase-measurement-connector-18.0.0.aar"
  4351. - info_path = "libs/com_google_firebase_firebase_measurement_connector/com_google_firebase_firebase_measurement_connector.info"
  4352. -
  4353. - # To remove visibility constraint, add this dependency to
  4354. - # //third_party/android_deps/build.gradle.
  4355. - visibility = [
  4356. - ":*",
  4357. - "//third_party/androidx:*",
  4358. - ]
  4359. - deps = [ ":google_play_services_basement_java" ]
  4360. - }
  4361. -
  4362. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  4363. java_prebuilt("com_squareup_javawriter_java") {
  4364. jar_path = "libs/com_squareup_javawriter/javawriter-2.1.1.jar"
  4365. diff --git a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
  4366. --- a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
  4367. +++ b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
  4368. @@ -8,7 +8,6 @@ android_library("javatests") {
  4369. testonly = true
  4370. sources = [ "org/chromium/preconditions/PreconditionsTest.java" ]
  4371. deps = [
  4372. - "$google_play_services_package:google_play_services_basement_java",
  4373. "//base:base_java",
  4374. "//base:base_java_test_support",
  4375. "//base/test:test_support_java",
  4376. diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java b/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java
  4377. --- a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java
  4378. +++ b/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java
  4379. @@ -5,9 +5,6 @@ package org.chromium.gms;
  4380. import android.content.Context;
  4381. -import com.google.android.gms.common.ConnectionResult;
  4382. -import com.google.android.gms.common.GoogleApiAvailability;
  4383. -
  4384. // Refer to go/doubledown-play-services#new-apis for more detail.
  4385. public final class ChromiumPlayServicesAvailability {
  4386. /**
  4387. @@ -30,9 +27,7 @@ public final class ChromiumPlayServicesAvailability {
  4388. * PM/UX.
  4389. */
  4390. public static boolean isGooglePlayServicesAvailable(final Context context) {
  4391. - return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
  4392. - context, GMS_VERSION_NUMBER)
  4393. - == ConnectionResult.SUCCESS;
  4394. + return false;
  4395. }
  4396. /**
  4397. @@ -50,7 +45,6 @@ public final class ChromiumPlayServicesAvailability {
  4398. * PM/UX.
  4399. */
  4400. public static int getGooglePlayServicesConnectionResult(final Context context) {
  4401. - return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
  4402. - context, GMS_VERSION_NUMBER);
  4403. + return 16; // API_UNAVAILABLE
  4404. }
  4405. }
  4406. --
  4407. 2.20.1