Add more components to the GN build.

google
infobars
invalidation
navigation_intercaption
network_time
password_manager
plugins
search_provider_logos
sessions

R=viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/397953005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283521 0039d316-1c4b-4281-b951-d872f2087c98

components/BUILD.gn

@@ -26,17 +26,27 @@ group("all_components") {
     "//components/favicon_base",
     "//components/feedback",
     "//components/gcm_driver",
+    "//components/google/core/browser",
     "//components/history/core/browser",
     "//components/history/core/common",
     "//components/history/core/test",
+    "//components/infobars/core",
+    "//components/infobars/test:test_support",
+    "//components/invalidation",
     "//components/json_schema",
     "//components/language_usage_metrics",
     "//components/leveldb_proto",
     "//components/metrics",
+    "//components/navigation_interception",
     "//components/navigation_metrics",
+    "//components/network_time",
     "//components/omaha_query_params",
     "//components/onc",
     "//components/os_crypt",
+    "//components/password_manager/content/browser",
+    "//components/password_manager/core/browser",
+    "//components/password_manager/core/common",
+    "//components/plugins/renderer",
     "//components/policy",
     "//components/precache/core",
     "//components/precache/content",
@@ -45,6 +55,8 @@ group("all_components") {
     "//components/rappor",
     "//components/resources:components_resources",
     "//components/search_engines",
+    "//components/search_provider_logos",
+    "//components/sessions",
     "//components/signin/core/browser",
     "//components/startup_metric_utils",
     "//components/strings",
@@ -92,16 +104,27 @@ group("all_components") {
       "//components/favicon/core",  # Blocked on keyed service.
       "//components/feedback",  # Blocked on content.
       "//components/gcm_driver",  # Should work, needs checking.
+      "//components/google/core/browser",  # Should work, needs checking.
       "//components/history/core/browser",  # Should work, needs checking.
       "//components/history/core/common",  # Should work, needs checking.
       "//components/history/core/test",  # Should work, needs checking.
+      "//components/infobars/core",  # Should work, needs checking.
+      "//components/infobars/test:test_support",  # Should work, needs checking.
+      "//components/invalidation",  # Should work, needs checking.
       "//components/json_schema",  # Should work, needs checking.
       "//components/keyed_service/content",  # Blocked on content.
-      "//components/precache/core",  # Should work, needs checking.
-      "//components/precache/content",  # Blocked on content.
+      "//components/navigation_interception",  # Blocked on content.
+      "//components/password_manager/content/browser",  # Blocked on content.
+      "//components/password_manager/core/browser",  # Should work, needs checking.
+      "//components/password_manager/core/common",  # Should work, needs checking.
+      "//components/plugins/renderer",  # Blocked on blink.
       "//components/policy",  # Blocked on content (indirectly via autofill).
+      "//components/precache/content",  # Blocked on content.
+      "//components/precache/core",  # Should work, needs checking.
       "//components/rappor",  # Should work, needs checking.
       "//components/search_engines",  # Should work, needs checking.
+      "//components/search_provider_logos",  # Should work, needs checking.
+      "//components/sessions",  # Blocked on content.
       "//components/signin/core/browser",  # Should work, needs checking.
       "//components/translate/content/browser",  # Blocked on content.
       "//components/translate/content/common",  # Blocked on content.

components/google.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/google/core/browser
       'target_name': 'google_core_browser',
       'type': 'static_library',
       'dependencies': [
@@ -21,6 +22,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources duplicated in GN build.
         'google/core/browser/google_pref_names.cc',
         'google/core/browser/google_pref_names.h',
         'google/core/browser/google_search_metrics.cc',

components/google/core/browser/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("browser") {
+  sources = [
+    "google_pref_names.cc",
+    "google_pref_names.h",
+    "google_search_metrics.cc",
+    "google_search_metrics.h",
+    "google_switches.cc",
+    "google_switches.h",
+    "google_url_tracker.cc",
+    "google_url_tracker.h",
+    "google_url_tracker_client.cc",
+    "google_url_tracker_client.h",
+    "google_url_tracker_infobar_delegate.cc",
+    "google_url_tracker_infobar_delegate.h",
+    "google_url_tracker_map_entry.cc",
+    "google_url_tracker_map_entry.h",
+    "google_url_tracker_navigation_helper.cc",
+    "google_url_tracker_navigation_helper.h",
+    "google_util.cc",
+    "google_util.h",
+  ]
+
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]
+  }
+
+  deps = [
+    "//base",
+    "//components/keyed_service/core",
+    "//components/infobars/core",
+    "//components/strings",
+    "//components/url_fixer",
+    "//net",
+    "//ui/base",
+    "//url",
+  ]
+}

components/infobars.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/infobars/core
       'target_name': 'infobars_core',
       'type': 'static_library',
       'include_dirs': [
@@ -17,6 +18,7 @@
         '../ui/strings/ui_strings.gyp:ui_strings',
       ],
       'sources': [
+        # Note: sources duplicated in GN build.
         'infobars/core/confirm_infobar_delegate.cc',
         'infobars/core/confirm_infobar_delegate.h',
         'infobars/core/infobar.cc',
@@ -33,8 +35,9 @@
       ],
     },
     {
+      # GN version: //components/infobars/test:test_support
       'target_name': 'infobars_test_support',
-     'type': 'static_library',
+      'type': 'static_library',
       'include_dirs': [
         '..',
       ],
@@ -43,6 +46,7 @@
         '../skia/skia.gyp:skia',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'infobars/test/infobar_test.cc',
       ],
     },

components/infobars/core/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("core") {
+  sources = [
+    "confirm_infobar_delegate.cc",
+    "confirm_infobar_delegate.h",
+    "infobar.cc",
+    "infobar.h",
+    "infobar_android.cc",
+    "infobar_container.cc",
+    "infobar_container.h",
+    "infobar_delegate.cc",
+    "infobar_delegate.h",
+    "infobar_manager.cc",
+    "infobar_manager.h",
+    "infobars_switches.cc",
+    "infobars_switches.h",
+  ]
+
+  deps = [
+    "//base",
+    "//skia",
+    "//ui/gfx",
+    "//ui/strings",
+  ]
+
+  # This target exposes Skia headers in its public headers.
+  forward_dependent_configs_from = [ "//skia" ]
+}

components/infobars/test/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("test_support") {
+  sources = [
+    "infobar_test.cc",
+  ]
+
+  deps = [
+    "//base",
+    "//skia",
+  ]
+}

components/invalidation.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/invalidation
       'target_name': 'invalidation',
       'type': 'static_library',
       'dependencies': [
@@ -22,6 +23,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'invalidation/invalidation_logger.cc',
         'invalidation/invalidation_logger.h',
         'invalidation/invalidation_logger_observer.h',
@@ -42,6 +44,7 @@
       'conditions': [
           ['OS != "android"', {
             'sources': [
+              # Note: sources list duplicated in GN build.
               'invalidation/gcm_invalidation_bridge.cc',
               'invalidation/gcm_invalidation_bridge.h',
               'invalidation/gcm_network_channel.cc',
@@ -72,6 +75,7 @@
     },
 
     {
+      # GN version: //components/invalidation:test_support
       'target_name': 'invalidation_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -91,6 +95,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'invalidation/fake_invalidation_handler.cc',
         'invalidation/fake_invalidation_handler.h',
         'invalidation/fake_invalidation_state_tracker.cc',
@@ -105,6 +110,7 @@
       'conditions': [
           ['OS != "android"', {
             'sources': [
+              # Note: sources list duplicated in GN build.
               'invalidation/p2p_invalidation_service.cc',
               'invalidation/p2p_invalidation_service.h',
             ],

components/invalidation/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("invalidation") {
+  sources = [
+    "invalidation_logger.cc",
+    "invalidation_logger.h",
+    "invalidation_logger_observer.h",
+    "invalidation_prefs.cc",
+    "invalidation_prefs.h",
+    "invalidation_service.h",
+    "invalidation_service_util.cc",
+    "invalidation_service_util.h",
+    "invalidation_switches.cc",
+    "invalidation_switches.h",
+    "invalidator_registrar.cc",
+    "invalidator_registrar.h",
+    "invalidator_storage.cc",
+    "invalidator_storage.h",
+    "profile_invalidation_provider.cc",
+    "profile_invalidation_provider.h",
+  ]
+  if (!is_android) {
+    sources += [
+      "gcm_invalidation_bridge.cc",
+      "gcm_invalidation_bridge.h",
+      "gcm_network_channel.cc",
+      "gcm_network_channel.h",
+      "gcm_network_channel_delegate.h",
+      "invalidation_notifier.cc",
+      "invalidation_notifier.h",
+      "non_blocking_invalidator.cc",
+      "non_blocking_invalidator.h",
+      "notifier_reason_util.cc",
+      "notifier_reason_util.h",
+      "p2p_invalidator.cc",
+      "p2p_invalidator.h",
+      "push_client_channel.cc",
+      "push_client_channel.h",
+      "state_writer.h",
+      "sync_invalidation_listener.cc",
+      "sync_invalidation_listener.h",
+      "sync_system_resources.cc",
+      "sync_system_resources.h",
+      "ticl_invalidation_service.cc",
+      "ticl_invalidation_service.h",
+      "ticl_settings_provider.cc",
+      "ticl_settings_provider.h",
+    ]
+  }
+
+  # TODO(GYP) remove this when libjingle is added.
+  configs += [ "//content:libjingle_stub_config" ]
+
+  deps = [
+    "//base",
+    #"//components/gcm_driver",  TODO(GYP)
+    "//google_apis",
+    "//components/keyed_service/core",
+    "//components/pref_registry",
+    #"//components/signin/core/browser",  TODO(GYP)
+    "//sync",
+    "//third_party/cacheinvalidation",
+    #'../jingle/jingle.gyp:notifier',  TODO(GYP)
+  ]
+}
+
+static_library("test_support") {
+  sources = [
+    "fake_invalidation_handler.cc",
+    "fake_invalidation_handler.h",
+    "fake_invalidation_state_tracker.cc",
+    "fake_invalidation_state_tracker.h",
+    "fake_invalidator.cc",
+    "fake_invalidator.h",
+    "invalidation_service_test_template.cc",
+    "invalidation_service_test_template.h",
+    "invalidator_test_template.cc",
+    "invalidator_test_template.h",
+  ]
+  if (!is_android) {
+    sources += [
+      "p2p_invalidation_service.cc",
+      "p2p_invalidation_service.h",
+    ]
+  }
+
+  deps = [
+    "//base",
+    "//google_apis",
+    "//net",
+    "//sync",
+    "//testing/gmock",
+    "//third_party/cacheinvalidation",
+    #'../jingle/jingle.gyp:notifier',  TODO(GYP)
+    #'../jingle/jingle.gyp:notifier_test_util',  TODO(GYP)
+    #'../sync/sync.gyp:test_support_sync_notifier',  TODO(GYP)
+    #'gcm_driver_test_support',  TODO(GYP)
+  ]
+}

components/navigation_interception.gypi

@@ -6,6 +6,7 @@
 {
   'targets': [
     {
+      # GN version: //components/navigation_interception
       'target_name': 'navigation_interception',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ -20,6 +21,7 @@
         '../skia/config',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'navigation_interception/intercept_navigation_resource_throttle.cc',
         'navigation_interception/intercept_navigation_resource_throttle.h',
         'navigation_interception/navigation_params.h',
@@ -31,6 +33,7 @@
             'navigation_interception_jni_headers',
           ],
           'sources': [
+            # Note: sources list duplicated in GN build.
             'navigation_interception/component_jni_registrar.cc',
             'navigation_interception/component_jni_registrar.h',
             'navigation_interception/intercept_navigation_delegate.cc',
@@ -57,9 +60,11 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN version: //components/navigation_intercaption:jni_headers
           'target_name': 'navigation_interception_jni_headers',
           'type': 'none',
           'sources': [
+            # Note: sources list duplicated in GN build.
             'navigation_interception/android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java',
             'navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java',
           ],

components/navigation_interception/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+if (is_android) {
+  import("//build/config/android/rules.gni")
+}
+
+static_library("navigation_interception") {
+  sources = [
+    "intercept_navigation_resource_throttle.cc",
+    "intercept_navigation_resource_throttle.h",
+    "navigation_params.h",
+    "navigation_params.cc",
+  ]
+
+  deps = [
+    "//base",
+    "//content/public/browser",
+    "//content/public/common",
+    "//net",
+  ]
+
+  if (is_android) {
+    sources += [
+      "component_jni_registrar.cc",
+      "component_jni_registrar.h",
+      "intercept_navigation_delegate.cc",
+      "intercept_navigation_delegate.h",
+      "navigation_params_android.h",
+      "navigation_params_android.cc",
+    ]
+    deps += [ ":jni_headers" ]
+  }
+}
+
+if (is_android) {
+
+  # TODO(GYP): navigation_interception_java target
+
+  generate_jni("jni_headers") {
+    sources = [
+      "android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java",
+      "android/java/src/org/chromium/components/navigation_interception/NavigationParams.java",
+    ]
+    jni_package = "navigation_interception"
+  }
+}

components/network_time.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/network_time
       'target_name': 'network_time',
       'type': 'static_library',
       'dependencies': [
@@ -14,6 +15,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'network_time/network_time_tracker.cc',
         'network_time/network_time_tracker.h',
         'network_time/network_time_pref_names.cc',

components/network_time/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("network_time") {
+  sources = [
+    "network_time_tracker.cc",
+    "network_time_tracker.h",
+    "network_time_pref_names.cc",
+    "network_time_pref_names.h",
+  ]
+
+  deps = [
+    "//base",
+  ]
+}

components/password_manager.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/password_manager/core/browser
       'target_name': 'password_manager_core_browser',
       'type': 'static_library',
       'dependencies': [
@@ -21,6 +22,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'password_manager/core/browser/browser_save_password_progress_logger.cc',
         'password_manager/core/browser/browser_save_password_progress_logger.h',
         'password_manager/core/browser/log_receiver.h',
@@ -90,6 +92,7 @@
             ],
           },
           'sources': [
+            # Note: sources list duplicated in GN build.
             'password_manager/core/browser/password_syncable_service.cc',
             'password_manager/core/browser/password_syncable_service.h',
           ],
@@ -99,6 +102,7 @@
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
+      # GN version: //components/password_manager/core/browser:test_support
       'target_name': 'password_manager_core_browser_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -111,6 +115,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'password_manager/core/browser/mock_password_store.cc',
         'password_manager/core/browser/mock_password_store.h',
         'password_manager/core/browser/password_form_data.cc',
@@ -124,6 +129,7 @@
       ],
     },
     {
+      # GN version: //components/password_manager/core/common
       'target_name': 'password_manager_core_common',
       'type': 'static_library',
       'dependencies': [
@@ -132,6 +138,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'password_manager/core/common/password_manager_pref_names.cc',
         'password_manager/core/common/password_manager_pref_names.h',
         'password_manager/core/common/password_manager_switches.cc',
@@ -145,6 +152,7 @@
     ['OS != "ios"', {
       'targets': [
         {
+          # GN version: //components/password_manager/content/browser
           'target_name': 'password_manager_content_browser',
           'type': 'static_library',
           'dependencies': [
@@ -163,6 +171,7 @@
             '..',
           ],
           'sources': [
+            # Note: sources list duplicated in GN build.
             'password_manager/content/browser/content_password_manager_driver.cc',
             'password_manager/content/browser/content_password_manager_driver.h',
             'password_manager/content/browser/password_manager_internals_service_factory.cc',

components/password_manager/content/browser/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("browser") {
+  sources = [
+    "content_password_manager_driver.cc",
+    "content_password_manager_driver.h",
+    "password_manager_internals_service_factory.cc",
+    "password_manager_internals_service_factory.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/autofill/content/browser",
+    "//components/autofill/content/common",
+    "//components/autofill/core/common",
+    "//components/keyed_service/content",
+    "//components/password_manager/core/browser",
+    "//content/public/browser",
+    "//content/public/common",
+    "//ipc",
+    "//net",
+  ]
+}

components/password_manager/core/browser/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+if (is_android) {
+  import("//build/config/android/config.gni")
+}
+
+config("password_manager_config") {
+  # Sync (not supported in Android WebView).
+  if (!is_android || !is_android_webview_build) {
+    defines = [ "PASSWORD_MANAGER_ENABLE_SYNC" ]
+  }
+}
+
+static_library("browser") {
+  sources = [
+    "browser_save_password_progress_logger.cc",
+    "browser_save_password_progress_logger.h",
+    "log_receiver.h",
+    "log_router.cc",
+    "log_router.h",
+    "login_database.cc",
+    "login_database.h",
+    "login_database_mac.cc",
+    "login_database_posix.cc",
+    "login_database_win.cc",
+    "login_model.h",
+    "password_autofill_manager.cc",
+    "password_autofill_manager.h",
+    "password_form_manager.cc",
+    "password_form_manager.h",
+    "password_generation_manager.cc",
+    "password_generation_manager.h",
+    "password_manager.cc",
+    "password_manager.h",
+    "password_manager_client.cc",
+    "password_manager_client.h",
+    "password_manager_driver.h",
+    "password_manager_internals_service.cc",
+    "password_manager_internals_service.h",
+    "password_manager_metrics_util.cc",
+    "password_manager_metrics_util.h",
+    "password_store.cc",
+    "password_store.h",
+    "password_store_change.h",
+    "password_store_consumer.cc",
+    "password_store_consumer.h",
+    "password_store_default.cc",
+    "password_store_default.h",
+    "password_store_sync.cc",
+    "password_store_sync.h",
+    "psl_matching_helper.cc",
+    "psl_matching_helper.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/autofill/core/common",
+    "//components/keyed_service/core",
+    "//components/os_crypt",
+    "//components/password_manager/core/common",
+    "//net",
+    "//sql",
+    "//url",
+  ]
+
+  if (is_mac) {
+    # TODO(blundell): Provide the iOS login DB implementation and then
+    # also exclude the POSIX one from iOS. http://crbug.com/341429
+    sources -= [ "login_database_posix.cc" ]
+  } else if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]
+  }
+
+  direct_dependent_configs = [ ":password_manager_config" ]
+
+  # Sync (not supported in Android WebView).
+  if (!is_android || !is_android_webview_build) {
+    sources += [
+      "password_syncable_service.cc",
+      "password_syncable_service.h",
+    ]
+    deps += [ "//sync" ]
+  }
+}
+
+static_library("test_support") {
+  sources = [
+    "mock_password_store.cc",
+    "mock_password_store.h",
+    "password_form_data.cc",
+    "password_form_data.h",
+    "stub_password_manager_client.cc",
+    "stub_password_manager_client.h",
+    "stub_password_manager_driver.cc",
+    "stub_password_manager_driver.h",
+    "test_password_store.cc",
+    "test_password_store.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/autofill/core/common",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}

components/password_manager/core/common/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("common") {
+  sources = [
+    "password_manager_pref_names.cc",
+    "password_manager_pref_names.h",
+    "password_manager_switches.cc",
+    "password_manager_switches.h",
+    "password_manager_ui.cc",
+    "password_manager_ui.h",
+  ]
+}

components/plugins.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/plugins/renderer
       'target_name': 'plugins_renderer',
       'type': 'static_library',
       'dependencies': [
@@ -18,6 +19,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'plugins/renderer/plugin_placeholder.cc',
         'plugins/renderer/plugin_placeholder.h',
         'plugins/renderer/webview_plugin.cc',
@@ -26,6 +28,7 @@
       'conditions' : [
         ['OS=="android"', {
           'sources': [
+            # Note: sources list duplicated in GN build.
             'plugins/renderer/mobile_youtube_plugin.cc',
             'plugins/renderer/mobile_youtube_plugin.h',
           ]

components/plugins/renderer/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("renderer") {
+  sources = [
+    "plugin_placeholder.cc",
+    "plugin_placeholder.h",
+    "webview_plugin.cc",
+    "webview_plugin.h",
+  ]
+  if (is_android) {
+    sources += [
+      "mobile_youtube_plugin.cc",
+      "mobile_youtube_plugin.h",
+    ]
+  }
+
+  deps = [
+    "//gin",
+    "//skia",
+    "//third_party/WebKit/public:blink",
+    "//third_party/re2",
+    "//v8",
+  ]
+}

components/search_provider_logos/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("search_provider_logos") {
+  sources = [
+    "google_logo_api.cc",
+    "google_logo_api.h",
+    "logo_cache.cc",
+    "logo_cache.h",
+    "logo_common.cc",
+    "logo_common.h",
+    "logo_tracker.cc",
+    "logo_tracker.h",
+  ]
+
+  deps = [
+    "//base",
+    "//net",
+    "//skia",
+    "//ui/gfx",
+    "//url",
+  ]
+}

components/sessions.gypi

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //components/sessions
       'target_name': 'sessions',
       'type': '<(component)',
       'dependencies': [
@@ -21,6 +22,7 @@
         'SESSIONS_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'sessions/serialized_navigation_entry.cc',
         'sessions/serialized_navigation_entry.h',
       ],
@@ -33,6 +35,7 @@
       ],
     },
     {
+      # GN version: //components/sessions:test_support
       'target_name': 'sessions_test_support',
       'type': 'static_library',
       'defines!': ['SESSIONS_IMPLEMENTATION'],
@@ -44,6 +47,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'sessions/serialized_navigation_entry_test_helper.cc',
         'sessions/serialized_navigation_entry_test_helper.h',
       ],

components/sessions/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+if (is_android) {
+  import("//build/config/android/config.gn")
+}
+
+component("sessions") {
+  sources = [
+    "serialized_navigation_entry.cc",
+    "serialized_navigation_entry.h",
+  ]
+
+  defines = [ "SESSIONS_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//content/public/browser",
+    "//skia",
+    "//url",
+  ]
+
+  if (!is_android || !is_android_webview_build) {
+    deps += [ "//sync" ]
+  }
+}
+
+static_library("test_support") {
+  sources = [
+    "serialized_navigation_entry_test_helper.cc",
+    "serialized_navigation_entry_test_helper.h",
+  ]
+
+  deps = [
+    "//skia",
+    "//testing/gtest",
+  ]
+
+  if (!is_android || !is_android_webview_build) {
+    deps += [ "//sync" ]
+  }
+}