| Index: blimp/engine/BUILD.gn | 
| diff --git a/blimp/engine/BUILD.gn b/blimp/engine/BUILD.gn | 
| index 44b8d9ae9258bb20b0b9bf6a2acdb29767effc44..fb1fe5a7f8c849a779a499d6537cbec7323ef94d 100644 | 
| --- a/blimp/engine/BUILD.gn | 
| +++ b/blimp/engine/BUILD.gn | 
| @@ -55,6 +55,10 @@ source_set("app") { | 
| "app/blimp_content_main_delegate.h", | 
| ] | 
|  | 
| +  public_deps = [ | 
| +    ":app_metrics", | 
| +  ] | 
| + | 
| deps = [ | 
| ":app_config", | 
| ":app_net", | 
| @@ -98,6 +102,30 @@ source_set("app_config") { | 
| ] | 
| } | 
|  | 
| +source_set("app_metrics") { | 
| +  sources = [ | 
| +    "app/blimp_metrics_service_client.cc", | 
| +    "app/blimp_metrics_service_client.h", | 
| +  ] | 
| + | 
| +  public_deps = [ | 
| +    "//components/metrics", | 
| +    "//content/public/browser", | 
| +  ] | 
| + | 
| +  deps = [ | 
| +    "//base", | 
| +    "//base:i18n", | 
| +    "//components/metrics:gpu", | 
| +    "//components/metrics:net", | 
| +    "//components/metrics:profiler", | 
| +    "//components/metrics:ui", | 
| +    "//components/prefs", | 
| +    "//components/version_info", | 
| +    "//net", | 
| +  ] | 
| +} | 
| + | 
| source_set("app_net") { | 
| sources = [ | 
| "app/blimp_network_delegate.cc", | 
| @@ -201,11 +229,15 @@ source_set("common") { | 
| ] | 
|  | 
| deps = [ | 
| +    ":app_metrics", | 
| ":app_net", | 
| ":app_permissions", | 
| ":common_user_agent", | 
| "//base", | 
| -    "//content/public/browser", | 
| +    "//components/metrics", | 
| +    "//components/pref_registry", | 
| +    "//components/prefs", | 
| +    "//components/version_info", | 
| "//content/public/common", | 
| "//net", | 
| "//ui/base", | 
| @@ -334,6 +366,7 @@ source_set("app_unit_tests") { | 
|  | 
| sources = [ | 
| "app/blimp_engine_config_unittest.cc", | 
| +    "app/blimp_metrics_service_client_unittest.cc", | 
| "app/blimp_system_url_request_context_getter_unittest.cc", | 
| "app/settings_manager_unittest.cc", | 
| "app/ui/blimp_screen_unittest.cc", | 
| @@ -342,6 +375,7 @@ source_set("app_unit_tests") { | 
| deps = [ | 
| ":app", | 
| ":app_config", | 
| +    ":app_metrics", | 
| ":app_net", | 
| ":app_settings", | 
| ":app_switches", | 
| @@ -349,7 +383,11 @@ source_set("app_unit_tests") { | 
| "//base/test:run_all_unittests", | 
| "//base/test:test_support", | 
| "//blimp/engine:app_ui", | 
| +    "//components/metrics:metrics", | 
| +    "//components/pref_registry:pref_registry", | 
| +    "//components/prefs:prefs", | 
| "//content/test:test_support", | 
| +    "//net:test_support", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
| "//ui/display", | 
| @@ -357,6 +395,27 @@ source_set("app_unit_tests") { | 
| ] | 
| } | 
|  | 
| +source_set("common_unit_tests") { | 
| +  testonly = true | 
| + | 
| +  sources = [ | 
| +    "common/blimp_browser_context_unittest.cc", | 
| +  ] | 
| + | 
| +  deps = [ | 
| +    ":common", | 
| +    "//base", | 
| +    "//base/test:run_all_unittests", | 
| +    "//base/test:test_support", | 
| +    "//components/metrics:metrics", | 
| +    "//content/public/browser", | 
| +    "//content/test:test_support", | 
| +    "//net:test_support", | 
| +    "//testing/gmock", | 
| +    "//testing/gtest", | 
| +  ] | 
| +} | 
| + | 
| source_set("feature_unit_tests") { | 
| testonly = true | 
|  | 
| @@ -390,6 +449,7 @@ source_set("unit_tests") { | 
|  | 
| deps = [ | 
| ":app_unit_tests", | 
| +    ":common_unit_tests", | 
| ":feature_unit_tests", | 
| ] | 
| } | 
|  |