Add unit tests target to GN build.

Minor related GYP cleanup and added some missing dependencies and related targets to the GN build.

Support for compiling unit_tests with no ENABLE_WEBRTC.

Remove browser_action_drag_data_unittest.cc which is not compiled on any currently supported platform.

BUG=

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

Cr-Commit-Position: refs/heads/master@{#314078}

build/json_schema_api.gni

@@ -113,10 +113,7 @@ template("json_schema_api") {
 
       if (defined(invoker.visibility)) {
         # If visibility is restricted, add our own target to it.
-        visibility = [
-          invoker.visibility,
-          target_visibility,
-        ]
+        visibility = invoker.visibility + target_visibility
       }
     }
   }

chrome/browser/BUILD.gn

@@ -28,8 +28,24 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ "../chrome_browser.gypi" ])
 
 if (is_desktop_linux) {
+  # Gnome-keyring is normally dynamically loaded. The gnome_keyring config
+  # will set this up.
   pkg_config("gnome_keyring") {
     packages = [ "gnome-keyring-1" ]
+    defines = [
+      "USE_GNOME_KEYRING",
+      "DLOPEN_GNOME_KEYRING",
+    ]
+    ignore_libs = true
+  }
+
+  # If you want to link gnome-keyring directly (use only for unit tests)
+  # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a
+  # bit slow, so prefer not to run it again. In practice, gnome-keyring's libs
+  # are just itself and common gnome ones we link already, so we can get away
+  # with additionally just coding the library name here.
+  config("gnome_keyring_direct") {
+    libs = [ "gnome-keyring" ]
   }
 }
 
@@ -1012,8 +1028,12 @@ source_set("test_support") {
       "chromeos/policy/cloud_external_data_manager_base_test_util.h",
       "chromeos/policy/device_policy_builder.cc",
       "chromeos/policy/device_policy_builder.h",
+      "chromeos/policy/fake_consumer_management_service.cc",
+      "chromeos/policy/fake_consumer_management_service.h",
       "chromeos/policy/fake_device_cloud_policy_initializer.cc",
       "chromeos/policy/fake_device_cloud_policy_initializer.h",
+      "chromeos/policy/fake_device_cloud_policy_manager.cc",
+      "chromeos/policy/fake_device_cloud_policy_manager.h",
       "chromeos/policy/stub_enterprise_install_attributes.cc",
       "chromeos/policy/stub_enterprise_install_attributes.h",
       "chromeos/settings/device_settings_test_helper.cc",

chrome/browser/chrome_content_browser_client_unittest.cc

@@ -32,6 +32,8 @@ TEST_F(ChromeContentBrowserClientTest, ShouldAssignSiteForURL) {
   EXPECT_TRUE(client.ShouldAssignSiteForURL(GURL("https://www.google.com")));
 }
 
+#if defined(ENABLE_WEBRTC)
+
 // NOTE: Any updates to the expectations in these tests should also be done in
 // the browser test WebRtcDisableEncryptionFlagBrowserTest.
 class DisableWebRtcEncryptionFlagTest : public testing::Test {
@@ -87,6 +89,8 @@ TEST_F(DisableWebRtcEncryptionFlagTest, StableChannel) {
   EXPECT_FALSE(to_command_line_.HasSwitch(switches::kDisableWebRtcEncryption));
 }
 
+#endif  // ENABLE_WEBRTC
+
 }  // namespace chrome
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)

chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc

-// Copyright (c) 2012 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.
-
-#include "base/pickle.h"
-#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
-#include "chrome/test/base/testing_profile.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
-#include "url/gurl.h"
-
-namespace {
-
-ui::OSExchangeData::Provider* CloneProvider(const ui::OSExchangeData& data) {
-  return new ui::OSExchangeDataProviderWin(
-      ui::OSExchangeDataProviderWin::GetIDataObject(data));
-}
-
-}  // namespace
-
-typedef testing::Test BrowserActionDragDataTest;
-
-TEST_F(BrowserActionDragDataTest, ArbitraryFormat) {
-  TestingProfile profile;
-  profile.SetID(L"id");
-
-  ui::OSExchangeData data;
-  data.SetURL(GURL("http://www.google.com"), L"Title");
-
-  // We only support our format, so this should not succeed.
-  BrowserActionDragData drag_data;
-  EXPECT_FALSE(drag_data.Read(ui::OSExchangeData(CloneProvider(data))));
-}
-
-TEST_F(BrowserActionDragDataTest, BrowserActionDragDataFormat) {
-  TestingProfile profile;
-  Profile* profile_ptr = &profile;
-  profile.SetID(L"id");
-
-  const std::string extension_id = "42";
-  Pickle pickle;
-  pickle.WriteBytes(&profile_ptr, sizeof(&profile));
-  pickle.WriteString(extension_id);
-  pickle.WriteUInt64(42);
-
-  ui::OSExchangeData data;
-  data.SetPickledData(BrowserActionDragData::GetBrowserActionCustomFormat(),
-                      pickle);
-
-  BrowserActionDragData drag_data;
-  EXPECT_TRUE(drag_data.Read(ui::OSExchangeData(CloneProvider(data))));
-  ASSERT_TRUE(drag_data.IsFromProfile(profile.GetOriginalProfile()));
-  ASSERT_STREQ(extension_id.c_str(), drag_data.id().c_str());
-  ASSERT_EQ(42, drag_data.index());
-}

chrome/chrome_tests_unit.gypi

@@ -12,7 +12,6 @@
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
-      'app/chrome_dll.rc',
       # All unittests in browser, common, renderer and service.
       'browser/about_flags_unittest.cc',
       'browser/android/bookmarks/partner_bookmarks_shim_unittest.cc',
@@ -157,7 +156,6 @@
       'browser/net/predictor_unittest.cc',
       'browser/net/pref_proxy_config_tracker_impl_unittest.cc',
       'browser/net/probe_message_unittest.cc',
-      'browser/net/proxy_policy_handler_unittest.cc',
       'browser/net/quota_policy_channel_id_store_unittest.cc',
       'browser/net/safe_search_util_unittest.cc',
       'browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc',
@@ -183,7 +181,6 @@
       'browser/prefs/prefs_syncable_service_unittest.cc',
       'browser/prefs/profile_pref_store_manager_unittest.cc',
       'browser/prefs/proxy_config_dictionary_unittest.cc',
-      'browser/prefs/proxy_policy_unittest.cc',
       'browser/prefs/proxy_prefs_unittest.cc',
       'browser/prefs/session_startup_pref_unittest.cc',
       'browser/prefs/tracked/device_id_unittest.cc',
@@ -202,7 +199,6 @@
       'browser/process_info_snapshot_mac_unittest.cc',
       'browser/profiles/file_path_verifier_win_unittest.cc',
       'browser/profiles/gaia_info_update_service_unittest.cc',
-      'browser/profiles/incognito_mode_policy_handler_unittest.cc',
       'browser/profiles/profile_downloader_unittest.cc',
       'browser/profiles/profile_info_cache_unittest.cc',
       'browser/profiles/profile_info_cache_unittest.h',
@@ -235,7 +231,6 @@
       'browser/search/search_android_unittest.cc',
       'browser/search_engines/default_search_pref_migration_unittest.cc',
       'browser/search_engines/search_provider_install_data_unittest.cc',
-      'browser/search_engines/template_url_scraper_unittest.cc',
       'browser/service_process/service_process_control_mac_unittest.mm',
       'browser/services/gcm/fake_gcm_profile_service.cc',
       'browser/services/gcm/fake_gcm_profile_service.h',
@@ -244,7 +239,6 @@
       'browser/services/gcm/gcm_account_tracker_unittest.cc',
       'browser/services/gcm/push_messaging_application_id_unittest.cc',
       'browser/services/gcm/push_messaging_permission_context_unittest.cc',
-      'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
       'browser/shell_integration_win_unittest.cc',
       'browser/signin/account_reconcilor_unittest.cc',
       'browser/signin/account_service_flag_fetcher_unittest.cc',
@@ -296,7 +290,6 @@
       'browser/sync/sessions/session_data_type_controller_unittest.cc',
       'browser/sync/sessions/tab_node_pool_unittest.cc',
       'browser/sync/startup_controller_unittest.cc',
-      'browser/sync/sync_policy_handler_unittest.cc',
       'browser/sync/sync_startup_tracker_unittest.cc',
       'browser/sync/test/test_http_bridge_factory.cc',
       'browser/sync/test/test_http_bridge_factory.h',
@@ -571,7 +564,6 @@
       'test/base/menu_model_test.h',
       'test/base/v8_unit_test.cc',
       'test/base/v8_unit_test.h',
-      'test/data/resource.rc',
       'test/data/unit/framework_unittest.gtestjs',
       'test/logging/win/mof_data_parser_unittest.cc',
       'utility/chrome_content_utility_client_unittest.cc',
@@ -1188,7 +1180,6 @@
       'browser/chromeos/file_system_provider/mount_path_util_unittest.cc',
       'browser/chromeos/file_system_provider/operations/abort_unittest.cc',
       'browser/chromeos/file_system_provider/operations/add_watcher_unittest.cc',
-      'browser/chromeos/file_system_provider/operations/add_watcher_unittest.cc',
       'browser/chromeos/file_system_provider/operations/close_file_unittest.cc',
       'browser/chromeos/file_system_provider/operations/copy_entry_unittest.cc',
       'browser/chromeos/file_system_provider/operations/create_directory_unittest.cc',
@@ -1328,7 +1319,6 @@
       'browser/ui/views/confirm_bubble_views_unittest.cc',
       'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',
       'browser/ui/views/desktop_media_picker_views_unittest.cc',
-      'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
       'browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc',
       'browser/ui/views/first_run_bubble_unittest.cc',
       'browser/ui/views/frame/browser_view_layout_unittest.cc',
@@ -1349,6 +1339,11 @@
       'browser/ui/views/translate/translate_bubble_view_unittest.cc',
       'browser/ui/views/validation_message_bubble_delegate_unittest.cc',
     ],
+    'chrome_unit_tests_win_sources': [
+      'app/chrome_dll.rc',
+      'browser/search_engines/template_url_scraper_unittest.cc',
+      'test/data/resource.rc',
+    ],
     'chrome_unit_tests_mac_sources': [
       'browser/media_galleries/fileapi/iphoto_file_util_unittest.cc',
       'utility/media_galleries/iphoto_library_parser_unittest.cc',
@@ -1356,7 +1351,6 @@
     'chrome_unit_tests_win_mac_sources': [
       'browser/media_galleries/fileapi/itunes_file_util_unittest.cc',
       'browser/media_galleries/fileapi/picasa_file_util_unittest.cc',
-      'common/extensions/api/networking_private/networking_private_crypto_unittest.cc',
       'utility/media_galleries/itunes_library_parser_unittest.cc',
       'utility/media_galleries/picasa_album_table_reader_unittest.cc',
       'utility/media_galleries/picasa_albums_indexer_unittest.cc',
@@ -1795,6 +1789,7 @@
             '../chromeos/chromeos.gyp:chromeos_test_support',
           ],
           'sources': [
+            # Note: sources list duplicated in GN build.
             'browser/chromeos/app_mode/fake_cws.cc',
             'browser/chromeos/app_mode/fake_cws.h',
             'browser/chromeos/file_manager/fake_disk_mount_manager.cc',
@@ -2001,6 +1996,7 @@
       ],
     },
     {
+      # GN version: //chrome/test:test_support_unit
       'target_name': 'test_support_unit',
       'type': 'static_library',
       'dependencies': [
@@ -2027,6 +2023,7 @@
       ],
     },
     {
+      # GN version: //chrome/test:unit_tests
       'target_name': 'unit_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ -2203,9 +2200,6 @@
             '../ui/aura/aura.gyp:aura_test_support',
             '../ui/views/views.gyp:views_test_support',
           ],
-          'sources!': [
-            'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
-          ],
           'sources': [
             '../ui/views/controls/webview/webview_unittest.cc',
           ],
@@ -2258,6 +2252,16 @@
                 'browser/policy/policy_path_parser_unittest.cc',
               ],
             }],
+            ['OS!="android" and OS!="ios" and chromeos==0', {
+              'sources': [
+                'browser/net/disk_cache_dir_policy_handler_unittest.cc',
+              ],
+            }],
+            ['OS!="android" and OS!="ios"', {
+              'sources': [
+                'browser/download/download_dir_policy_handler_unittest.cc'
+              ],
+            }],
           ],
         }],
         ['enable_web_speech==1', {
@@ -2464,6 +2468,7 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
+            '<@(chrome_unit_tests_win_sources)',
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
@@ -2482,13 +2487,6 @@
               '-lwinmm.lib',
             ],
           },
-        }, { # else: OS != "win"
-          'sources!': [
-            'app/chrome_dll.rc',
-            'browser/search_engines/template_url_scraper_unittest.cc',
-            'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
-            'test/data/resource.rc',
-          ],
         }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
@@ -2501,8 +2499,6 @@
           ],
           'sources!': [
             'browser/metrics/variations/variations_request_scheduler_mobile_unittest.cc',
-            'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc',
-            'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h',
             'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc',
           ],
         }],
@@ -2524,16 +2520,6 @@
         }, {  # Not Android.
           'sources': [ '<@(chrome_unit_tests_non_android_sources)' ],
         }],
-        ['OS!="android" and OS!="ios" and chromeos==0 and configuration_policy==1', {
-          'sources': [
-            'browser/net/disk_cache_dir_policy_handler_unittest.cc',
-          ],
-        }],
-        ['OS!="android" and OS!="ios" and configuration_policy==1', {
-          'sources': [
-            'browser/download/download_dir_policy_handler_unittest.cc'
-          ],
-        }],
         ['enable_themes == 1', {
           'sources': [ '<@(chrome_unit_tests_themes_sources)' ],
         }],
@@ -2597,6 +2583,7 @@
             'browser/plugins/plugin_installer_unittest.cc',
           ],
         }],
+        # Adding more conditions? Don't forget to update the GN build.
       ],
     },
     {

chrome/tools/convert_dict/BUILD.gn

+# Copyright 2015 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.
+
+source_set("lib") {
+  # Production code shouldn't be depending on this.
+  testonly = true
+
+  sources = [
+    "aff_reader.cc",
+    "aff_reader.h",
+    "dic_reader.cc",
+    "dic_reader.h",
+    "hunspell_reader.cc",
+    "hunspell_reader.h",
+  ]
+  configs += [ "//build/config/compiler:wexit_time_destructors" ]
+  deps = [
+    "//base",
+  ]
+}
+
+executable("convert_dict") {
+  # Production code shouldn't be depending on this.
+  testonly = true
+
+  sources = [
+    "convert_dict.cc",
+  ]
+  configs += [ "//build/config/compiler:wexit_time_destructors" ]
+  deps = [
+    ":lib",
+    "//base",
+    "//base:i18n",
+    "//third_party/hunspell",
+  ]
+}

chrome/tools/convert_dict/convert_dict.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //chrome/tools/convert_dict:lib
       'target_name': 'convert_dict_lib',
       'product_name': 'convert_dict',
       'type': 'static_library',

chrome/tools/profile_reset/BUILD.gn

+# Copyright 2015 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.
+
+executable("jtl_compiler") {
+  sources = [
+    "//chrome/browser/profile_resetter/jtl_foundation.cc",
+    "//chrome/browser/profile_resetter/jtl_foundation.h",
+    "jtl_compiler_frontend.cc",
+  ]
+  deps = [
+    ":jtl_compiler_lib",
+    "//base",
+    "//crypto",
+  ]
+}
+
+source_set("jtl_compiler_lib") {
+  sources = [
+    "//chrome/browser/profile_resetter/jtl_foundation.h",
+    "//chrome/browser/profile_resetter/jtl_instructions.h",
+    "jtl_compiler.h",
+    "jtl_compiler.cc",
+    "jtl_parser.h",
+    "jtl_parser.cc",
+  ]
+  deps = [
+    "//base",
+    "//third_party/re2",
+  ]
+}

chrome/tools/profile_reset/jtl_compiler.gyp

@@ -4,6 +4,7 @@
   },
   'targets': [
     {
+      # GN version: //chrome/tools/profile_reset:jtl_compiler
       'target_name': 'jtl_compiler',
       'type': 'executable',
       'dependencies': [
@@ -18,6 +19,7 @@
       ],
     },
     {
+      # GN version: //chrome/tools/profile_reset:jtl_compiler_lib
       'target_name': 'jtl_compiler_lib',
       'type': 'static_library',
       'product_name': 'jtl_compiler',

extensions/BUILD.gn

@@ -75,6 +75,10 @@ source_set("test_support") {
     "browser/api_test_utils.h",
     "browser/api_unittest.cc",
     "browser/api_unittest.h",
+    "browser/app_window/test_app_window_contents.cc",
+    "browser/app_window/test_app_window_contents.h",
+    "browser/extension_error_test_util.cc",
+    "browser/extension_error_test_util.h",
     "browser/extensions_test.cc",
     "browser/extensions_test.h",
     "browser/guest_view/test_guest_view_manager.cc",

tools/json_schema_compiler/test/BUILD.gn

+# Copyright 2015 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.
+
+import("//build/json_schema_api.gni")
+
+json_schema_api("api") {
+  visibility = [ ":*" ]
+
+  sources = [
+    "additional_properties.json",
+    "any.json",
+    "arrays.json",
+    "callbacks.json",
+    "choices.json",
+    "crossref.json",
+    "enums.json",
+    "functions_as_parameters.json",
+    "functions_on_types.json",
+    "idl_basics.idl",
+    "idl_other_namespace.idl",
+    "idl_other_namespace_sub_namespace.idl",
+    "idl_object_types.idl",
+    "objects.json",
+    "simple_api.json",
+    "error_generation.json",
+  ]
+
+  schemas = true
+  root_namespace = "test::api::%(namespace)s"
+}
+
+source_set("test") {
+  testonly = true
+  sources = [
+    "test_util.cc",
+    "test_util.h",
+  ]
+  public_deps = [
+    ":api",
+  ]
+
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]
+  }
+}

tools/json_schema_compiler/test/json_schema_compiler_tests.gyp

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //tools/json_schema_compiler:test
       'target_name': 'json_schema_compiler_tests',
       'type': 'static_library',
       'variables': {

ui/base/BUILD.gn

@@ -349,6 +349,8 @@ component("base") {
       "ime/chromeos/input_method_manager.h",
       "ime/chromeos/input_method_whitelist.cc",
       "ime/chromeos/input_method_whitelist.h",
+      "ime/chromeos/mock_component_extension_ime_manager_delegate.cc",
+      "ime/chromeos/mock_component_extension_ime_manager_delegate.h",
       "ime/chromeos/mock_ime_candidate_window_handler.cc",
       "ime/chromeos/mock_ime_candidate_window_handler.h",
       "ime/chromeos/mock_ime_engine_handler.cc",