Skip to content

GitLab

T
tangled
Commit a49b7e13 authored by Xiaoling Bao's avatar Xiaoling Bao Committed by Commit Bot
Browse files
Options

Move DM files into a standalone directory 

Change-Id: Id7ded4c40ff61ac61d767f45544f5a9677e788ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317992
Commit-Queue: Xiaoling Bao <xiaolingbao@chromium.org>
Auto-Submit: Xiaoling Bao <xiaolingbao@chromium.org>
Reviewed-by: default avatarSorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792055}
parent 68073c3e
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 69 deletions
chrome/updater/BUILD.gn
View file @ a49b7e13
......@@ -94,16 +94,6 @@ if (is_win || is_mac) {
"control_service_in_process.cc",
"control_service_in_process.h",
"crx_downloader_factory.h",
"dm_cached_policy_info.cc",
"dm_cached_policy_info.h",
"dm_client.cc",
"dm_client.h",
"dm_message.cc",
"dm_message.h",
"dm_policy_manager.cc",
"dm_policy_manager.h",
"dm_storage.cc",
"dm_storage.h",
"external_constants.cc",
"external_constants.h",
"external_constants_impl.h",
......@@ -131,7 +121,6 @@ if (is_win || is_mac) {
"app/server/mac/service_protocol.mm",
"app/server/mac/update_service_wrappers.h",
"app/server/mac/update_service_wrappers.mm",
"dm_storage_mac.mm",
"external_constants_mac.mm",
"installer_mac.cc",
"lib_util_mac.mm",
......@@ -155,7 +144,6 @@ if (is_win || is_mac) {
"app/server/win/server.h",
"app/server/win/service_main.cc",
"app/server/win/service_main.h",
"dm_storage_win.cc",
"external_constants_win.cc",
"installer_win.cc",
"lib_util_win.cc",
......@@ -168,20 +156,15 @@ if (is_win || is_mac) {
":base",
":version_header",
"//base",
"//chrome/updater/protos:omaha_proto",
"//chrome/updater/device_management",
"//components/crash/core/common:crash_key",
"//components/crx_file:crx_file",
"//components/prefs",
"//components/update_client",
"//components/version_info",
"//crypto",
"//third_party/boringssl",
"//url",
]
public_deps = [
"//components/policy/core/common:common",
"//components/policy/proto",
]
if (is_win) {
deps += [
......@@ -240,12 +223,6 @@ if (is_win || is_mac) {
sources = [
"app/app_server_unittest.cc",
"dm_client_unittest.cc",
"dm_message_unittest.cc",
"dm_policy_builder_for_testing.cc",
"dm_policy_builder_for_testing.h",
"dm_policy_manager_unittest.cc",
"dm_storage_unittest.cc",
"external_constants_unittest.cc",
"external_constants_unittest.h",
"lib_util_unittest.cc",
......@@ -270,18 +247,15 @@ if (is_win || is_mac) {
"//base",
"//base/test:test_support",
"//chrome/common:constants",
"//chrome/updater/device_management:unittest",
"//chrome/updater/test/test_app",
"//chrome/updater/tools:unittest",
"//components/prefs:test_support",
"//components/update_client",
"//crypto",
"//net:test_support",
"//testing/gtest",
"//url",
]
public_deps = [ "//chrome/updater/protos:omaha_proto" ]
if (is_win) {
sources += [
"external_constants_win_unittest.cc",
......
chrome/updater/device_management/BUILD.gn 0 → 100644
View file @ a49b7e13
# Copyright 2020 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/config/chrome_build.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/util/process_version.gni")
import("//chrome/updater/branding.gni")
import("//testing/test.gni")
set_sources_assignment_filter([])
source_set("device_management") {
sources = [
"dm_cached_policy_info.cc",
"dm_cached_policy_info.h",
"dm_client.cc",
"dm_client.h",
"dm_message.cc",
"dm_message.h",
"dm_policy_manager.cc",
"dm_policy_manager.h",
"dm_storage.cc",
"dm_storage.h",
]
deps = [
"//base",
"//chrome/updater:base",
"//chrome/updater:version_header",
"//chrome/updater/protos:omaha_proto",
"//components/update_client",
"//crypto",
"//third_party/boringssl",
"//url",
]
public_deps = [
"//components/policy/core/common:common",
"//components/policy/proto",
]
if (is_mac) {
sources += [ "dm_storage_mac.mm" ]
deps += [ "//chrome/updater/mac:network_fetcher_sources" ]
}
if (is_win) {
sources += [ "dm_storage_win.cc" ]
deps += [
"//chrome/updater/win:constants",
"//chrome/updater/win:lib",
]
}
}
source_set("unittest") {
testonly = true
sources = [
"dm_client_unittest.cc",
"dm_message_unittest.cc",
"dm_policy_builder_for_testing.cc",
"dm_policy_builder_for_testing.h",
"dm_policy_manager_unittest.cc",
"dm_storage_unittest.cc",
]
deps = [
":device_management",
"//base",
"//base/test:test_support",
"//chrome/updater:base",
"//chrome/updater/protos:omaha_proto",
"//components/update_client:update_client",
"//net:test_support",
"//testing/gtest",
"//url",
]
if (is_mac) {
deps += [ "//chrome/updater/mac:network_fetcher_sources" ]
}
if (is_win) {
deps += [ "//chrome/updater/win:lib" ]
}
}
chrome/updater/dm_cached_policy_info.cc → chrome/updater/device_management/dm_cached_policy_info.cc
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_cached_policy_info.h"
#include "chrome/updater/device_management/dm_cached_policy_info.h"
#include "components/policy/proto/device_management_backend.pb.h"
......
chrome/updater/dm_cached_policy_info.h → chrome/updater/device_management/dm_cached_policy_info.h
View file @ a49b7e13
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_UPDATER_DM_CACHED_POLICY_INFO_H_
#define CHROME_UPDATER_DM_CACHED_POLICY_INFO_H_
#ifndef CHROME_UPDATER_DEVICE_MANAGEMENT_DM_CACHED_POLICY_INFO_H_
#define CHROME_UPDATER_DEVICE_MANAGEMENT_DM_CACHED_POLICY_INFO_H_
#include <stdint.h>
#include <string>
......@@ -37,4 +37,4 @@ class CachedPolicyInfo {
} // namespace updater
#endif // CHROME_UPDATER_DM_CACHED_POLICY_INFO_H_
#endif // CHROME_UPDATER_DEVICE_MANAGEMENT_DM_CACHED_POLICY_INFO_H_
chrome/updater/dm_client.cc → chrome/updater/device_management/dm_client.cc
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_client.h"
#include "chrome/updater/device_management/dm_client.h"
#include <utility>
......@@ -12,7 +12,7 @@
#include "base/threading/sequenced_task_runner_handle.h"
#include "build/build_config.h"
#include "chrome/updater/constants.h"
#include "chrome/updater/dm_storage.h"
#include "chrome/updater/device_management/dm_storage.h"
#include "chrome/updater/updater_version.h"
#include "chrome/updater/util.h"
#include "components/policy/core/common/cloud/cloud_policy_util.h"
......
chrome/updater/dm_client.h → chrome/updater/device_management/dm_client.h
View file @ a49b7e13
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_UPDATER_DM_CLIENT_H_
#define CHROME_UPDATER_DM_CLIENT_H_
#ifndef CHROME_UPDATER_DEVICE_MANAGEMENT_DM_CLIENT_H_
#define CHROME_UPDATER_DEVICE_MANAGEMENT_DM_CLIENT_H_
#include <stdint.h>
......@@ -119,4 +119,4 @@ class DMClient {
} // namespace updater
#endif // CHROME_UPDATER_DM_CLIENT_H_
#endif // CHROME_UPDATER_DEVICE_MANAGEMENT_DM_CLIENT_H_
chrome/updater/dm_client_unittest.cc → chrome/updater/device_management/dm_client_unittest.cc
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_client.h"
#include "chrome/updater/device_management/dm_client.h"
#include <stdint.h>
......@@ -14,7 +14,7 @@
#include "base/test/gmock_callback_support.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
#include "chrome/updater/dm_storage.h"
#include "chrome/updater/device_management/dm_storage.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "components/update_client/network.h"
#include "net/base/url_util.h"
......
chrome/updater/dm_message.cc → chrome/updater/device_management/dm_message.cc
View file @ a49b7e13
......@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_message.h"
#include "chrome/updater/device_management/dm_message.h"
#include <memory>
#include <utility>
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "chrome/updater/dm_cached_policy_info.h"
#include "chrome/updater/device_management/dm_cached_policy_info.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "crypto/signature_verifier.h"
......
chrome/updater/dm_message.h → chrome/updater/device_management/dm_message.h
View file @ a49b7e13
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_UPDATER_DM_MESSAGE_H_
#define CHROME_UPDATER_DM_MESSAGE_H_
#ifndef CHROME_UPDATER_DEVICE_MANAGEMENT_DM_MESSAGE_H_
#define CHROME_UPDATER_DEVICE_MANAGEMENT_DM_MESSAGE_H_
#include <string>
......@@ -42,4 +42,4 @@ DMPolicyMap ParsePolicyFetchResponse(const std::string& response_data,
const std::string& expected_device_id);
} // namespace updater
#endif // CHROME_UPDATER_DM_MESSAGE_H_
#endif // CHROME_UPDATER_DEVICE_MANAGEMENT_DM_MESSAGE_H_
chrome/updater/dm_message_unittest.cc → chrome/updater/device_management/dm_message_unittest.cc
View file @ a49b7e13
......@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_message.h"
#include "chrome/updater/device_management/dm_message.h"
#include <stdint.h>
#include <memory>
#include <utility>
#include "chrome/updater/dm_cached_policy_info.h"
#include "chrome/updater/dm_policy_builder_for_testing.h"
#include "chrome/updater/device_management/dm_cached_policy_info.h"
#include "chrome/updater/device_management/dm_policy_builder_for_testing.h"
#include "chrome/updater/protos/omaha_settings.pb.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
......
chrome/updater/dm_policy_builder_for_testing.cc → chrome/updater/device_management/dm_policy_builder_for_testing.cc
View file @ a49b7e13
......@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_policy_builder_for_testing.h"
#include "chrome/updater/device_management/dm_policy_builder_for_testing.h"
#include <stdint.h>
#include <utility>
#include "base/strings/string_util.h"
#include "chrome/updater/dm_cached_policy_info.h"
#include "chrome/updater/device_management/dm_cached_policy_info.h"
#include "chrome/updater/protos/omaha_settings.pb.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "crypto/rsa_private_key.h"
......
chrome/updater/dm_policy_builder_for_testing.h → chrome/updater/device_management/dm_policy_builder_for_testing.h
View file @ a49b7e13
......@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_UPDATER_DM_POLICY_BUILDER_FOR_TESTING_H_
#define CHROME_UPDATER_DM_POLICY_BUILDER_FOR_TESTING_H_
#ifndef CHROME_UPDATER_DEVICE_MANAGEMENT_DM_POLICY_BUILDER_FOR_TESTING_H_
#define CHROME_UPDATER_DEVICE_MANAGEMENT_DM_POLICY_BUILDER_FOR_TESTING_H_
#include <stdint.h>
#include <memory>
#include <string>
#include <vector>
#include "chrome/updater/dm_message.h"
#include "chrome/updater/device_management/dm_message.h"
namespace enterprise_management {
class DeviceManagementResponse;
......@@ -145,4 +145,4 @@ GetDefaultTestingPolicyFetchDMResponse(
} // namespace updater
#endif // CHROME_UPDATER_DM_POLICY_BUILDER_FOR_TESTING_H_
#endif // CHROME_UPDATER_DEVICE_MANAGEMENT_DM_POLICY_BUILDER_FOR_TESTING_H_
chrome/updater/dm_policy_manager.cc → chrome/updater/device_management/dm_policy_manager.cc
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_policy_manager.h"
#include "chrome/updater/device_management/dm_policy_manager.h"
#include "base/enterprise_util.h"
#include "base/strings/string_util.h"
......
chrome/updater/dm_policy_manager.h → chrome/updater/device_management/dm_policy_manager.h
View file @ a49b7e13
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_UPDATER_DM_POLICY_MANAGER_H_
#define CHROME_UPDATER_DM_POLICY_MANAGER_H_
#ifndef CHROME_UPDATER_DEVICE_MANAGEMENT_DM_POLICY_MANAGER_H_
#define CHROME_UPDATER_DEVICE_MANAGEMENT_DM_POLICY_MANAGER_H_
#include <memory>
#include <string>
......@@ -60,4 +60,4 @@ class DMPolicyManager : public PolicyManagerInterface {
} // namespace updater
#endif // CHROME_UPDATER_DM_POLICY_MANAGER_H_
#endif // CHROME_UPDATER_DEVICE_MANAGEMENT_DM_POLICY_MANAGER_H_
chrome/updater/dm_policy_manager_unittest.cc → chrome/updater/device_management/dm_policy_manager_unittest.cc
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_policy_manager.h"
#include "chrome/updater/device_management/dm_policy_manager.h"
#include "build/build_config.h"
#include "chrome/updater/constants.h"
......
chrome/updater/dm_storage.cc → chrome/updater/device_management/dm_storage.cc
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_storage.h"
#include "chrome/updater/device_management/dm_storage.h"
#include <set>
#include <utility>
......@@ -13,8 +13,8 @@
#include "base/files/important_file_writer.h"
#include "base/strings/string16.h"
#include "base/strings/sys_string_conversions.h"
#include "chrome/updater/dm_cached_policy_info.h"
#include "chrome/updater/dm_policy_manager.h"
#include "chrome/updater/device_management/dm_cached_policy_info.h"
#include "chrome/updater/device_management/dm_policy_manager.h"
#include "chrome/updater/updater_version.h"
#include "chrome/updater/util.h"
#include "components/policy/proto/device_management_backend.pb.h"
......
chrome/updater/dm_storage.h → chrome/updater/device_management/dm_storage.h
View file @ a49b7e13
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_UPDATER_DM_STORAGE_H_
#define CHROME_UPDATER_DM_STORAGE_H_
#ifndef CHROME_UPDATER_DEVICE_MANAGEMENT_DM_STORAGE_H_
#define CHROME_UPDATER_DEVICE_MANAGEMENT_DM_STORAGE_H_
#include <memory>
#include <string>
......@@ -12,7 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/sequence_checker.h"
#include "build/build_config.h"
#include "chrome/updater/dm_message.h"
#include "chrome/updater/device_management/dm_message.h"
namespace updater {
......@@ -139,4 +139,4 @@ scoped_refptr<DMStorage> GetDefaultDMStorage();
} // namespace updater
#endif // CHROME_UPDATER_DM_STORAGE_H_
#endif // CHROME_UPDATER_DEVICE_MANAGEMENT_DM_STORAGE_H_
chrome/updater/dm_storage_mac.mm → chrome/updater/device_management/dm_storage_mac.mm
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_storage.h"
#include "chrome/updater/device_management/dm_storage.h"
#import <Foundation/Foundation.h>
#include <string>
......
chrome/updater/dm_storage_unittest.cc → chrome/updater/device_management/dm_storage_unittest.cc
View file @ a49b7e13
......@@ -8,8 +8,8 @@
#include "base/files/scoped_temp_dir.h"
#include "build/build_config.h"
#include "chrome/updater/constants.h"
#include "chrome/updater/dm_cached_policy_info.h"
#include "chrome/updater/dm_storage.h"
#include "chrome/updater/device_management/dm_cached_policy_info.h"
#include "chrome/updater/device_management/dm_storage.h"
#include "chrome/updater/policy_manager.h"
#include "chrome/updater/protos/omaha_settings.pb.h"
#include "components/policy/proto/device_management_backend.pb.h"
......
chrome/updater/dm_storage_win.cc → chrome/updater/device_management/dm_storage_win.cc
View file @ a49b7e13
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/updater/dm_storage.h"
#include "chrome/updater/device_management/dm_storage.h"
#include "base/strings/string16.h"
#include "base/strings/sys_string_conversions.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment