| Index: ios/public/provider/chrome/browser/BUILD.gn
 | 
| diff --git a/ios/public/provider/chrome/browser/BUILD.gn b/ios/public/provider/chrome/browser/BUILD.gn
 | 
| index a0b4224f79e40a08c779e7673f9650b49555258c..1f36b352b4e0a92e98830fbe8fb87cf6d9d695c2 100644
 | 
| --- a/ios/public/provider/chrome/browser/BUILD.gn
 | 
| +++ b/ios/public/provider/chrome/browser/BUILD.gn
 | 
| @@ -9,73 +9,29 @@ source_set("browser") {
 | 
|    sources = [
 | 
|      "chrome_browser_provider.h",
 | 
|      "chrome_browser_provider.mm",
 | 
| -    "distribution/app_distribution_provider.h",
 | 
| -    "distribution/app_distribution_provider.mm",
 | 
|      "geolocation_updater_provider.h",
 | 
|      "geolocation_updater_provider.mm",
 | 
| -    "images/branded_image_provider.h",
 | 
| -    "images/branded_image_provider.mm",
 | 
| -    "images/whats_new_icon.h",
 | 
| -    "native_app_launcher/native_app_metadata.h",
 | 
| -    "native_app_launcher/native_app_types.h",
 | 
| -    "native_app_launcher/native_app_whitelist_manager.h",
 | 
| -    "omaha/omaha_service_provider.h",
 | 
| -    "omaha/omaha_service_provider.mm",
 | 
| -    "sessions/live_tab_context_provider.h",
 | 
| -    "signin/chrome_identity.h",
 | 
| -    "signin/chrome_identity.mm",
 | 
| -    "signin/chrome_identity_browser_opener.h",
 | 
| -    "signin/chrome_identity_interaction_manager.h",
 | 
| -    "signin/chrome_identity_interaction_manager.mm",
 | 
| -    "signin/chrome_identity_service.h",
 | 
| -    "signin/chrome_identity_service.mm",
 | 
| -    "signin/signin_error_provider.h",
 | 
| -    "signin/signin_error_provider.mm",
 | 
| -    "signin/signin_resources_provider.h",
 | 
| -    "signin/signin_resources_provider.mm",
 | 
| -    "ui/app_rating_prompt.h",
 | 
| -    "ui/default_ios_web_view_factory.h",
 | 
| -    "ui/default_ios_web_view_factory.mm",
 | 
| -    "ui/infobar_view_delegate.h",
 | 
| -    "ui/infobar_view_protocol.h",
 | 
| -    "ui/logo_vendor.h",
 | 
| -    "ui/text_field_styling.h",
 | 
| -    "user_feedback/user_feedback_provider.h",
 | 
| -    "user_feedback/user_feedback_provider.mm",
 | 
| -    "voice/audio_session_controller.h",
 | 
| -    "voice/logo_animation_controller.h",
 | 
| -    "voice/voice_search_bar.h",
 | 
| -    "voice/voice_search_bar_owner.h",
 | 
| -    "voice/voice_search_controller.h",
 | 
| -    "voice/voice_search_controller.mm",
 | 
| -    "voice/voice_search_controller_delegate.h",
 | 
| -    "voice/voice_search_language.h",
 | 
| -    "voice/voice_search_language.mm",
 | 
| -    "voice/voice_search_prefs.cc",
 | 
| -    "voice/voice_search_prefs.h",
 | 
| -    "voice/voice_search_presenter.h",
 | 
| -    "voice/voice_search_provider.h",
 | 
| -    "voice/voice_search_provider.mm",
 | 
|    ]
 | 
| -
 | 
| -  public_deps = [
 | 
| -    ":provider_flags",
 | 
| -  ]
 | 
| -
 | 
|    deps = [
 | 
|      "//base",
 | 
| -    "//components/autofill/core/browser",
 | 
|      "//components/favicon_base",
 | 
|      "//components/metrics",
 | 
|      "//components/sync_sessions",
 | 
| -    "//ios/web",
 | 
| -    "//url",
 | 
|    ]
 | 
| +  libs = [ "CoreLocation.framework" ]
 | 
|  
 | 
| -  libs = [
 | 
| -    "CoreGraphics.framework",
 | 
| -    "CoreLocation.framework",
 | 
| -    "Foundation.framework",
 | 
| +  # TODO(sdefresne): remove once downstream has been converted to depends
 | 
| +  # directly on the sub-targets.
 | 
| +  public_deps = [
 | 
| +    "//ios/public/provider/chrome/browser/distribution",
 | 
| +    "//ios/public/provider/chrome/browser/images",
 | 
| +    "//ios/public/provider/chrome/browser/native_app_launcher",
 | 
| +    "//ios/public/provider/chrome/browser/omaha",
 | 
| +    "//ios/public/provider/chrome/browser/sessions",
 | 
| +    "//ios/public/provider/chrome/browser/signin",
 | 
| +    "//ios/public/provider/chrome/browser/ui",
 | 
| +    "//ios/public/provider/chrome/browser/user_feedback",
 | 
| +    "//ios/public/provider/chrome/browser/voice",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
| @@ -86,49 +42,38 @@ buildflag_header("provider_flags") {
 | 
|  
 | 
|  source_set("test_support") {
 | 
|    testonly = true
 | 
| -
 | 
|    sources = [
 | 
| -    "distribution/test_app_distribution_provider.h",
 | 
| -    "distribution/test_app_distribution_provider.mm",
 | 
| -    "images/test_branded_image_provider.h",
 | 
| -    "images/test_branded_image_provider.mm",
 | 
| -    "omaha/test_omaha_service_provider.h",
 | 
| -    "omaha/test_omaha_service_provider.mm",
 | 
| -    "sessions/test_live_tab_context_provider.cc",
 | 
| -    "sessions/test_live_tab_context_provider.h",
 | 
| -    "sessions/test_synced_window_delegates_getter.cc",
 | 
| -    "sessions/test_synced_window_delegates_getter.h",
 | 
| -    "signin/fake_chrome_identity.h",
 | 
| -    "signin/fake_chrome_identity.mm",
 | 
| -    "signin/fake_chrome_identity_interaction_manager.h",
 | 
| -    "signin/fake_chrome_identity_interaction_manager.mm",
 | 
| -    "signin/fake_chrome_identity_service.h",
 | 
| -    "signin/fake_chrome_identity_service.mm",
 | 
| -    "signin/test_signin_resources_provider.h",
 | 
| -    "signin/test_signin_resources_provider.mm",
 | 
|      "test_chrome_browser_provider.h",
 | 
|      "test_chrome_browser_provider.mm",
 | 
|      "test_chrome_provider_initializer.h",
 | 
|      "test_chrome_provider_initializer.mm",
 | 
| -    "ui/test_infobar_view.h",
 | 
| -    "ui/test_infobar_view.mm",
 | 
| -    "ui/test_styled_text_field.h",
 | 
| -    "ui/test_styled_text_field.mm",
 | 
| -    "user_feedback/test_user_feedback_provider.h",
 | 
| -    "user_feedback/test_user_feedback_provider.mm",
 | 
| -    "voice/test_voice_search_provider.h",
 | 
| -    "voice/test_voice_search_provider.mm",
 | 
|    ]
 | 
| -
 | 
|    deps = [
 | 
| -    ":browser",
 | 
|      "//base",
 | 
| -    "//components/signin/ios/browser:test_support",
 | 
| -    "//components/sync_sessions",
 | 
| -    "//ios/chrome/app/theme",
 | 
| +    "//ios/public/provider/chrome/browser",
 | 
| +    "//ios/public/provider/chrome/browser/distribution:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/images:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/omaha:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/sessions:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/signin:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/ui",
 | 
| +    "//ios/public/provider/chrome/browser/ui:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/user_feedback:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/voice",
 | 
| +    "//ios/public/provider/chrome/browser/voice:test_support",
 | 
|      "//testing/gtest",
 | 
|    ]
 | 
| +
 | 
| +  # TODO(sdefresne): remove once downstream has been converted to depends
 | 
| +  # directly on the sub-targets.
 | 
|    public_deps = [
 | 
| -    "//testing/gmock",
 | 
| +    "//ios/public/provider/chrome/browser/distribution:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/images:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/omaha:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/sessions:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/signin:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/ui:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/user_feedback:test_support",
 | 
| +    "//ios/public/provider/chrome/browser/voice:test_support",
 | 
|    ]
 | 
|  }
 | 
| 
 |