summaryrefslogtreecommitdiff
path: root/chromium/chromeos
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-05 14:08:31 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-11 07:46:53 +0000
commit6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch)
treeab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/chromeos
parente733310db58160074f574c429d48f8308c0afe17 (diff)
downloadqtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/chromeos')
-rw-r--r--chromium/chromeos/BUILD.gn3
-rw-r--r--chromium/chromeos/chromeos.gyp2
-rw-r--r--chromium/chromeos/components/BUILD.gn21
-rw-r--r--chromium/chromeos/components/tether/BUILD.gn82
4 files changed, 108 insertions, 0 deletions
diff --git a/chromium/chromeos/BUILD.gn b/chromium/chromeos/BUILD.gn
index 6a416a8b5bb..2413b9e4454 100644
--- a/chromium/chromeos/BUILD.gn
+++ b/chromium/chromeos/BUILD.gn
@@ -30,13 +30,16 @@ component("chromeos") {
"//base",
"//base:i18n",
"//base/third_party/dynamic_annotations",
+ "//chrome/browser/chromeos:device_policy_proto",
"//components/device_event_log",
"//components/onc",
+ "//components/policy:cloud_policy_proto_generated_compile",
"//components/policy/proto",
"//components/pref_registry",
"//components/prefs",
"//components/proxy_config",
"//components/signin/core/account_id",
+ "//components/url_formatter",
"//components/user_manager",
"//crypto",
"//crypto:platform",
diff --git a/chromium/chromeos/chromeos.gyp b/chromium/chromeos/chromeos.gyp
index 4f72786cd63..a02a49b727a 100644
--- a/chromium/chromeos/chromeos.gyp
+++ b/chromium/chromeos/chromeos.gyp
@@ -390,6 +390,8 @@
'settings/timezone_settings.h',
'settings/timezone_settings_helper.cc',
'settings/timezone_settings_helper.h',
+ 'system/devicemode.cc',
+ 'system/devicemode.h',
'system/devicetype.cc',
'system/devicetype.h',
diff --git a/chromium/chromeos/components/BUILD.gn b/chromium/chromeos/components/BUILD.gn
new file mode 100644
index 00000000000..636f4bccd3e
--- /dev/null
+++ b/chromium/chromeos/components/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2016 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("//testing/test.gni")
+
+assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
+
+# To add a unit test to this target, make a "unit_test" source_set in your
+# component and add a reference here.
+test("chromeos_components_unittests") {
+ sources = [
+ "run_all_unittests.cc",
+ ]
+
+ deps = [
+ "//base",
+ "//base/test:test_support",
+ "//chromeos/components/tether:unit_tests",
+ ]
+}
diff --git a/chromium/chromeos/components/tether/BUILD.gn b/chromium/chromeos/components/tether/BUILD.gn
new file mode 100644
index 00000000000..ecdd54b1c87
--- /dev/null
+++ b/chromium/chromeos/components/tether/BUILD.gn
@@ -0,0 +1,82 @@
+# Copyright 2016 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.
+
+assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
+
+static_library("tether") {
+ sources = [
+ "ble_advertisement_device_queue.cc",
+ "ble_advertisement_device_queue.h",
+ "ble_advertiser.cc",
+ "ble_advertiser.h",
+ "ble_constants.cc",
+ "ble_constants.h",
+ "ble_scanner.cc",
+ "ble_scanner.h",
+ "host_scan_scheduler.cc",
+ "host_scan_scheduler.h",
+ "host_scanner.cc",
+ "host_scanner.h",
+ "initializer.cc",
+ "initializer.h",
+ "local_device_data_provider.cc",
+ "local_device_data_provider.h",
+ ]
+
+ deps = [
+ "//base",
+ "//chromeos",
+ "//components/cryptauth",
+ "//components/proximity_auth/logging",
+ "//device/bluetooth",
+ ]
+
+ public_deps = [
+ "//components/cryptauth/proto",
+ ]
+}
+
+static_library("test_support") {
+ testonly = true
+
+ sources = [
+ "mock_local_device_data_provider.cc",
+ "mock_local_device_data_provider.h",
+ ]
+
+ public_deps = [
+ ":tether",
+ ]
+
+ deps = [
+ "//base",
+ "//components/cryptauth",
+ "//testing/gmock",
+ ]
+}
+
+source_set("unit_tests") {
+ testonly = true
+
+ sources = [
+ "ble_advertisement_device_queue_unittest.cc",
+ "ble_advertiser_unittest.cc",
+ "ble_scanner_unittest.cc",
+ "host_scan_scheduler_unittest.cc",
+ "local_device_data_provider_unittest.cc",
+ ]
+
+ deps = [
+ ":test_support",
+ ":tether",
+ "//base/test:test_support",
+ "//chromeos",
+ "//components/cryptauth",
+ "//components/cryptauth:test_support",
+ "//device/bluetooth",
+ "//device/bluetooth:mocks",
+ "//testing/gmock",
+ "//testing/gtest",
+ ]
+}