Skip to content

GitLab

T
tangled
Commit 32403176 authored by Brian Malcolm's avatar Brian Malcolm Committed by Commit Bot
Browse files
Options

DeviceNativePrintersExternalDataHandler -> DevicePrintersExternalDataHandler 

BUG=chromium:1105185

Change-Id: Ia6a7d87f4151b259552e609bc5c4c46f4470037e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2355001Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Commit-Queue: Brian Malcolm <bmalcolm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798884}
parent 882149ae
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 46 deletions
chrome/browser/chromeos/BUILD.gn
View file @ 32403176
...@@ -2067,10 +2067,10 @@ source_set("chromeos") { ...@@ -2067,10 +2067,10 @@ source_set("chromeos") {
"policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.h", "policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.h",
"policy/external_data_handlers/device_cloud_external_data_policy_handler.cc", "policy/external_data_handlers/device_cloud_external_data_policy_handler.cc",
"policy/external_data_handlers/device_cloud_external_data_policy_handler.h", "policy/external_data_handlers/device_cloud_external_data_policy_handler.h",
"policy/external_data_handlers/device_native_printers_external_data_handler.cc",
"policy/external_data_handlers/device_native_printers_external_data_handler.h",
"policy/external_data_handlers/device_print_servers_external_data_handler.cc", "policy/external_data_handlers/device_print_servers_external_data_handler.cc",
"policy/external_data_handlers/device_print_servers_external_data_handler.h", "policy/external_data_handlers/device_print_servers_external_data_handler.h",
"policy/external_data_handlers/device_printers_external_data_handler.cc",
"policy/external_data_handlers/device_printers_external_data_handler.h",
"policy/external_data_handlers/device_wallpaper_image_external_data_handler.cc", "policy/external_data_handlers/device_wallpaper_image_external_data_handler.cc",
"policy/external_data_handlers/device_wallpaper_image_external_data_handler.h", "policy/external_data_handlers/device_wallpaper_image_external_data_handler.h",
"policy/external_data_handlers/device_wilco_dtc_configuration_external_data_handler.cc", "policy/external_data_handlers/device_wilco_dtc_configuration_external_data_handler.cc",
...@@ -3372,8 +3372,8 @@ source_set("unit_tests") { ...@@ -3372,8 +3372,8 @@ source_set("unit_tests") {
"policy/extension_install_event_log_unittest.cc", "policy/extension_install_event_log_unittest.cc",
"policy/extension_install_event_log_uploader_unittest.cc", "policy/extension_install_event_log_uploader_unittest.cc",
"policy/extension_install_event_logger_unittest.cc", "policy/extension_install_event_logger_unittest.cc",
"policy/external_data_handlers/device_native_printers_external_data_handler_unittest.cc",
"policy/external_data_handlers/device_print_servers_external_data_handler_unittest.cc", "policy/external_data_handlers/device_print_servers_external_data_handler_unittest.cc",
"policy/external_data_handlers/device_printers_external_data_handler_unittest.cc",
"policy/fake_affiliated_invalidation_service_provider.cc", "policy/fake_affiliated_invalidation_service_provider.cc",
"policy/fake_affiliated_invalidation_service_provider.h", "policy/fake_affiliated_invalidation_service_provider.h",
"policy/heartbeat_scheduler_unittest.cc", "policy/heartbeat_scheduler_unittest.cc",
......
chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
View file @ 32403176
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include "chrome/browser/chromeos/policy/device_wifi_allowed_handler.h" #include "chrome/browser/chromeos/policy/device_wifi_allowed_handler.h"
#include "chrome/browser/chromeos/policy/enrollment_config.h" #include "chrome/browser/chromeos/policy/enrollment_config.h"
#include "chrome/browser/chromeos/policy/enrollment_requisition_manager.h" #include "chrome/browser/chromeos/policy/enrollment_requisition_manager.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/device_native_printers_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/device_print_servers_external_data_handler.h" #include "chrome/browser/chromeos/policy/external_data_handlers/device_print_servers_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/device_printers_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/device_wallpaper_image_external_data_handler.h" #include "chrome/browser/chromeos/policy/external_data_handlers/device_wallpaper_image_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/device_wilco_dtc_configuration_external_data_handler.h" #include "chrome/browser/chromeos/policy/external_data_handlers/device_wilco_dtc_configuration_external_data_handler.h"
#include "chrome/browser/chromeos/policy/hostname_handler.h" #include "chrome/browser/chromeos/policy/hostname_handler.h"
...@@ -271,7 +271,7 @@ void BrowserPolicyConnectorChromeOS::Init( ...@@ -271,7 +271,7 @@ void BrowserPolicyConnectorChromeOS::Init(
DCHECK(calculator_factory) DCHECK(calculator_factory)
<< "Policy connector initialized before the bulk printers factory"; << "Policy connector initialized before the bulk printers factory";
device_cloud_external_data_policy_handlers_.push_back( device_cloud_external_data_policy_handlers_.push_back(
std::make_unique<policy::DeviceNativePrintersExternalDataHandler>( std::make_unique<policy::DevicePrintersExternalDataHandler>(
GetPolicyService(), calculator_factory->GetForDevice())); GetPolicyService(), calculator_factory->GetForDevice()));
device_cloud_external_data_policy_handlers_.push_back( device_cloud_external_data_policy_handlers_.push_back(
std::make_unique<policy::DevicePrintServersExternalDataHandler>( std::make_unique<policy::DevicePrintServersExternalDataHandler>(
......
chrome/browser/chromeos/policy/external_data_handlers/device_native_printers_external_data_handler.cc → chrome/browser/chromeos/policy/external_data_handlers/device_printers_external_data_handler.cc
View file @ 32403176
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/chromeos/policy/external_data_handlers/device_native_printers_external_data_handler.h" #include "chrome/browser/chromeos/policy/external_data_handlers/device_printers_external_data_handler.h"
#include <utility> #include <utility>
...@@ -12,33 +12,32 @@ ...@@ -12,33 +12,32 @@
namespace policy { namespace policy {
DeviceNativePrintersExternalDataHandler:: DevicePrintersExternalDataHandler::DevicePrintersExternalDataHandler(
DeviceNativePrintersExternalDataHandler(
PolicyService* policy_service, PolicyService* policy_service,
base::WeakPtr<chromeos::BulkPrintersCalculator> calculator) base::WeakPtr<chromeos::BulkPrintersCalculator> calculator)
: calculator_(calculator), : calculator_(calculator),
device_native_printers_observer_( device_printers_observer_(
std::make_unique<DeviceCloudExternalDataPolicyObserver>( std::make_unique<DeviceCloudExternalDataPolicyObserver>(
policy_service, policy_service,
key::kDevicePrinters, key::kDevicePrinters,
this)) {} this)) {}
DeviceNativePrintersExternalDataHandler:: DevicePrintersExternalDataHandler::~DevicePrintersExternalDataHandler() =
~DeviceNativePrintersExternalDataHandler() = default; default;
void DeviceNativePrintersExternalDataHandler::OnDeviceExternalDataSet( void DevicePrintersExternalDataHandler::OnDeviceExternalDataSet(
const std::string& policy) { const std::string& policy) {
if (calculator_) if (calculator_)
calculator_->ClearData(); calculator_->ClearData();
} }
void DeviceNativePrintersExternalDataHandler::OnDeviceExternalDataCleared( void DevicePrintersExternalDataHandler::OnDeviceExternalDataCleared(
const std::string& policy) { const std::string& policy) {
if (calculator_) if (calculator_)
calculator_->ClearData(); calculator_->ClearData();
} }
void DeviceNativePrintersExternalDataHandler::OnDeviceExternalDataFetched( void DevicePrintersExternalDataHandler::OnDeviceExternalDataFetched(
const std::string& policy, const std::string& policy,
std::unique_ptr<std::string> data, std::unique_ptr<std::string> data,
const base::FilePath& file_path) { const base::FilePath& file_path) {
...@@ -46,8 +45,8 @@ void DeviceNativePrintersExternalDataHandler::OnDeviceExternalDataFetched( ...@@ -46,8 +45,8 @@ void DeviceNativePrintersExternalDataHandler::OnDeviceExternalDataFetched(
calculator_->SetData(std::move(data)); calculator_->SetData(std::move(data));
} }
void DeviceNativePrintersExternalDataHandler::Shutdown() { void DevicePrintersExternalDataHandler::Shutdown() {
device_native_printers_observer_.reset(); device_printers_observer_.reset();
} }
} // namespace policy } // namespace policy
chrome/browser/chromeos/policy/external_data_handlers/device_native_printers_external_data_handler.h → chrome/browser/chromeos/policy/external_data_handlers/device_printers_external_data_handler.h
View file @ 32403176
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_NATIVE_PRINTERS_EXTERNAL_DATA_HANDLER_H_ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_NATIVE_PRINTERS_EXTERNAL_DATA_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#include <memory> #include <memory>
#include <string> #include <string>
...@@ -19,13 +19,13 @@ namespace policy { ...@@ -19,13 +19,13 @@ namespace policy {
class PolicyService; class PolicyService;
class DeviceNativePrintersExternalDataHandler class DevicePrintersExternalDataHandler
: public DeviceCloudExternalDataPolicyHandler { : public DeviceCloudExternalDataPolicyHandler {
public: public:
DeviceNativePrintersExternalDataHandler( DevicePrintersExternalDataHandler(
PolicyService* policy_service, PolicyService* policy_service,
base::WeakPtr<chromeos::BulkPrintersCalculator> device_calculator); base::WeakPtr<chromeos::BulkPrintersCalculator> device_calculator);
~DeviceNativePrintersExternalDataHandler() override; ~DevicePrintersExternalDataHandler() override;
// DeviceCloudExternalDataPolicyHandler: // DeviceCloudExternalDataPolicyHandler:
void OnDeviceExternalDataSet(const std::string& policy) override; void OnDeviceExternalDataSet(const std::string& policy) override;
...@@ -39,11 +39,11 @@ class DeviceNativePrintersExternalDataHandler ...@@ -39,11 +39,11 @@ class DeviceNativePrintersExternalDataHandler
base::WeakPtr<chromeos::BulkPrintersCalculator> calculator_; base::WeakPtr<chromeos::BulkPrintersCalculator> calculator_;
std::unique_ptr<DeviceCloudExternalDataPolicyObserver> std::unique_ptr<DeviceCloudExternalDataPolicyObserver>
device_native_printers_observer_; device_printers_observer_;
DISALLOW_COPY_AND_ASSIGN(DeviceNativePrintersExternalDataHandler); DISALLOW_COPY_AND_ASSIGN(DevicePrintersExternalDataHandler);
}; };
} // namespace policy } // namespace policy
#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_NATIVE_PRINTERS_EXTERNAL_DATA_HANDLER_H_ #endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
chrome/browser/chromeos/policy/external_data_handlers/device_native_printers_external_data_handler_unittest.cc → chrome/browser/chromeos/policy/external_data_handlers/device_printers_external_data_handler_unittest.cc
View file @ 32403176
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/chromeos/policy/external_data_handlers/device_native_printers_external_data_handler.h" #include "chrome/browser/chromeos/policy/external_data_handlers/device_printers_external_data_handler.h"
#include <memory> #include <memory>
#include <string> #include <string>
...@@ -23,11 +23,11 @@ namespace policy { ...@@ -23,11 +23,11 @@ namespace policy {
namespace { namespace {
// The number of printers in kDeviceNativePrintersContentsJson. // The number of printers in kDevicePrintersContentsJson.
const size_t kNumPrinters = 2; const size_t kNumPrinters = 2;
// An example device native printers configuration file. // An example device printers configuration file.
const char kDeviceNativePrintersContentsJson[] = R"json( const char kDevicePrintersContentsJson[] = R"json(
[ [
{ {
"id": "First", "id": "First",
...@@ -56,9 +56,9 @@ const char kDeviceNativePrintersContentsJson[] = R"json( ...@@ -56,9 +56,9 @@ const char kDeviceNativePrintersContentsJson[] = R"json(
} // namespace } // namespace
class DeviceNativePrintersExternalDataHandlerTest : public testing::Test { class DevicePrintersExternalDataHandlerTest : public testing::Test {
protected: protected:
DeviceNativePrintersExternalDataHandlerTest() {} DevicePrintersExternalDataHandlerTest() {}
// testing::Test // testing::Test
void SetUp() override { void SetUp() override {
...@@ -70,33 +70,33 @@ class DeviceNativePrintersExternalDataHandlerTest : public testing::Test { ...@@ -70,33 +70,33 @@ class DeviceNativePrintersExternalDataHandlerTest : public testing::Test {
RemoveObserver(policy::POLICY_DOMAIN_CHROME, testing::_)) RemoveObserver(policy::POLICY_DOMAIN_CHROME, testing::_))
.Times(1); .Times(1);
external_printers_ = chromeos::BulkPrintersCalculator::Create(); external_printers_ = chromeos::BulkPrintersCalculator::Create();
device_native_printers_external_data_handler_ = device_printers_external_data_handler_ =
std::make_unique<DeviceNativePrintersExternalDataHandler>( std::make_unique<DevicePrintersExternalDataHandler>(
&policy_service_, external_printers_->AsWeakPtr()); &policy_service_, external_printers_->AsWeakPtr());
external_printers_->SetAccessMode( external_printers_->SetAccessMode(
chromeos::BulkPrintersCalculator::ALL_ACCESS); chromeos::BulkPrintersCalculator::ALL_ACCESS);
} }
void TearDown() override { void TearDown() override {
device_native_printers_external_data_handler_->Shutdown(); device_printers_external_data_handler_->Shutdown();
} }
protected: protected:
base::test::TaskEnvironment task_environment_; base::test::TaskEnvironment task_environment_;
MockPolicyService policy_service_; MockPolicyService policy_service_;
std::unique_ptr<DeviceNativePrintersExternalDataHandler> std::unique_ptr<DevicePrintersExternalDataHandler>
device_native_printers_external_data_handler_; device_printers_external_data_handler_;
std::unique_ptr<chromeos::BulkPrintersCalculator> external_printers_; std::unique_ptr<chromeos::BulkPrintersCalculator> external_printers_;
}; };
TEST_F(DeviceNativePrintersExternalDataHandlerTest, OnDataFetched) { TEST_F(DevicePrintersExternalDataHandlerTest, OnDataFetched) {
EXPECT_TRUE(external_printers_->GetPrinters().empty()); EXPECT_TRUE(external_printers_->GetPrinters().empty());
device_native_printers_external_data_handler_->OnDeviceExternalDataSet( device_printers_external_data_handler_->OnDeviceExternalDataSet(
key::kDevicePrinters); key::kDevicePrinters);
device_native_printers_external_data_handler_->OnDeviceExternalDataFetched( device_printers_external_data_handler_->OnDeviceExternalDataFetched(
key::kDevicePrinters, key::kDevicePrinters,
std::make_unique<std::string>(kDeviceNativePrintersContentsJson), std::make_unique<std::string>(kDevicePrintersContentsJson),
base::FilePath()); base::FilePath());
task_environment_.RunUntilIdle(); task_environment_.RunUntilIdle();
...@@ -108,16 +108,16 @@ TEST_F(DeviceNativePrintersExternalDataHandlerTest, OnDataFetched) { ...@@ -108,16 +108,16 @@ TEST_F(DeviceNativePrintersExternalDataHandlerTest, OnDataFetched) {
EXPECT_EQ("Color Laser", printers.at("Second").display_name()); EXPECT_EQ("Color Laser", printers.at("Second").display_name());
} }
TEST_F(DeviceNativePrintersExternalDataHandlerTest, OnDataCleared) { TEST_F(DevicePrintersExternalDataHandlerTest, OnDataCleared) {
EXPECT_TRUE(external_printers_->GetPrinters().empty()); EXPECT_TRUE(external_printers_->GetPrinters().empty());
device_native_printers_external_data_handler_->OnDeviceExternalDataSet( device_printers_external_data_handler_->OnDeviceExternalDataSet(
key::kDevicePrinters); key::kDevicePrinters);
device_native_printers_external_data_handler_->OnDeviceExternalDataFetched( device_printers_external_data_handler_->OnDeviceExternalDataFetched(
key::kDevicePrinters, key::kDevicePrinters,
std::make_unique<std::string>(kDeviceNativePrintersContentsJson), std::make_unique<std::string>(kDevicePrintersContentsJson),
base::FilePath()); base::FilePath());
device_native_printers_external_data_handler_->OnDeviceExternalDataCleared( device_printers_external_data_handler_->OnDeviceExternalDataCleared(
key::kDevicePrinters); key::kDevicePrinters);
task_environment_.RunUntilIdle(); task_environment_.RunUntilIdle();
......
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