Change namespace chromeos => ash for //c/b/ash/usb
Code in //chrome/browser/ash/usb is a part of the ash-chrome, so namespace is changed to ash from chromeos. To avoid churn during other namespace transitions in future, this CL has temporary 'using' declarations. This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Bug: 1164001 Change-Id: I160323331092b0fedfc663302706ee31a3b3cb26 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2861885 Commit-Queue: Yeunjoo Choi <ychoi@igalia.com> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Cr-Commit-Position: refs/heads/master@{#886542}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
d5b41d9e2a
commit
ae8cfa8745
chrome/browser
ash
app_mode
arc
usb
chromeos
chromeos
@ -27,10 +27,6 @@ namespace ash {
|
||||
|
||||
namespace {
|
||||
|
||||
namespace disks = ::chromeos::disks;
|
||||
using ::chromeos::MountError;
|
||||
using ::chromeos::MountType;
|
||||
|
||||
constexpr base::FilePath::CharType kExternalUpdateManifest[] =
|
||||
"external_update.json";
|
||||
constexpr char kExternalCrx[] = "external_crx";
|
||||
|
@ -10,7 +10,7 @@
|
||||
namespace arc {
|
||||
|
||||
void ArcUsbHostBridgeDelegate::AttachDevicesToArcVm() {
|
||||
auto* const usb_detector = chromeos::CrosUsbDetector::Get();
|
||||
auto* const usb_detector = ash::CrosUsbDetector::Get();
|
||||
if (usb_detector && IsArcVmEnabled())
|
||||
usb_detector->ConnectSharedDevicesOnVmStartup(kArcVmName);
|
||||
}
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include "services/device/public/mojom/usb_enumeration_options.mojom.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
|
||||
namespace {
|
||||
|
||||
@ -162,14 +162,14 @@ class CrosUsbNotificationDelegate
|
||||
|
||||
void Close(bool by_user) override {
|
||||
if (by_user)
|
||||
disposition_ = chromeos::CrosUsbNotificationClosed::kByUser;
|
||||
disposition_ = CrosUsbNotificationClosed::kByUser;
|
||||
}
|
||||
|
||||
private:
|
||||
~CrosUsbNotificationDelegate() override = default;
|
||||
void HandleConnectToVm(const std::string& vm_name) {
|
||||
disposition_ = CrosUsbNotificationClosed::kConnectToLinux;
|
||||
chromeos::CrosUsbDetector* detector = chromeos::CrosUsbDetector::Get();
|
||||
CrosUsbDetector* detector = CrosUsbDetector::Get();
|
||||
if (detector) {
|
||||
detector->AttachUsbDeviceToVm(vm_name, guid_, base::DoNothing());
|
||||
return;
|
||||
@ -507,7 +507,7 @@ void CrosUsbDetector::OnMountEvent(
|
||||
return;
|
||||
}
|
||||
|
||||
const chromeos::disks::Disk* disk =
|
||||
const auto* disk =
|
||||
disks::DiskMountManager::GetInstance()->FindDiskBySourcePath(
|
||||
mount_info.source_path);
|
||||
|
||||
@ -965,4 +965,4 @@ void CrosUsbDetector::RelinquishDeviceClaim(const std::string& guid) {
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace chromeos
|
||||
} // namespace ash
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
class CrosUsbDetectorTest;
|
||||
|
||||
namespace chromeos {
|
||||
namespace ash {
|
||||
|
||||
const uint8_t kInvalidUsbPortNumber = 0xff;
|
||||
|
||||
@ -274,6 +274,12 @@ class CrosUsbDetector : public device::mojom::UsbDeviceManagerClient,
|
||||
DISALLOW_COPY_AND_ASSIGN(CrosUsbDetector);
|
||||
};
|
||||
|
||||
} // namespace ash
|
||||
|
||||
// TODO(https://crbug.com/1164001): remove when ChromOS code migration is done.
|
||||
namespace chromeos {
|
||||
using ::ash::CrosUsbDetector;
|
||||
using ::ash::CrosUsbDeviceObserver;
|
||||
} // namespace chromeos
|
||||
|
||||
#endif // CHROME_BROWSER_ASH_USB_CROS_USB_DETECTOR_H_
|
||||
|
@ -115,7 +115,7 @@ scoped_refptr<device::FakeUsbDeviceInfo> CreateTestDeviceOfClass(
|
||||
{InterfaceCodes(device_class, 0xff, 0xff)});
|
||||
}
|
||||
|
||||
class TestCrosUsbDeviceObserver : public chromeos::CrosUsbDeviceObserver {
|
||||
class TestCrosUsbDeviceObserver : public ash::CrosUsbDeviceObserver {
|
||||
public:
|
||||
void OnUsbDevicesChanged() override { ++notify_count_; }
|
||||
|
||||
@ -159,7 +159,7 @@ class CrosUsbDetectorTest : public BrowserWithTestWindowTest {
|
||||
}
|
||||
|
||||
void SetUp() override {
|
||||
cros_usb_detector_ = std::make_unique<chromeos::CrosUsbDetector>();
|
||||
cros_usb_detector_ = std::make_unique<ash::CrosUsbDetector>();
|
||||
BrowserWithTestWindowTest::SetUp();
|
||||
crostini_test_helper_ =
|
||||
std::make_unique<crostini::CrostiniTestHelper>(profile());
|
||||
@ -173,7 +173,7 @@ class CrosUsbDetectorTest : public BrowserWithTestWindowTest {
|
||||
mojo::PendingRemote<device::mojom::UsbDeviceManager> device_manager;
|
||||
device_manager_.AddReceiver(
|
||||
device_manager.InitWithNewPipeAndPassReceiver());
|
||||
chromeos::CrosUsbDetector::Get()->SetDeviceManagerForTesting(
|
||||
ash::CrosUsbDetector::Get()->SetDeviceManagerForTesting(
|
||||
std::move(device_manager));
|
||||
// Create a default VM instance which is running.
|
||||
crostini::CrostiniManager::GetForProfile(profile())->AddRunningVmForTesting(
|
||||
@ -187,7 +187,7 @@ class CrosUsbDetectorTest : public BrowserWithTestWindowTest {
|
||||
}
|
||||
|
||||
void ConnectToDeviceManager() {
|
||||
chromeos::CrosUsbDetector::Get()->ConnectToDeviceManager();
|
||||
ash::CrosUsbDetector::Get()->ConnectToDeviceManager();
|
||||
}
|
||||
|
||||
MOCK_METHOD1(OnAttach, void(bool success));
|
||||
@ -222,7 +222,7 @@ class CrosUsbDetectorTest : public BrowserWithTestWindowTest {
|
||||
// The GetSingle..() functions expect only one device is present and may crash
|
||||
// if there are no devices (we can't use ASSERT_EQ as they return values).
|
||||
|
||||
chromeos::CrosUsbDeviceInfo GetSingleDeviceInfo() const {
|
||||
ash::CrosUsbDeviceInfo GetSingleDeviceInfo() const {
|
||||
auto devices = cros_usb_detector_->GetShareableDevices();
|
||||
EXPECT_EQ(1U, devices.size());
|
||||
return devices.front();
|
||||
@ -286,7 +286,7 @@ class CrosUsbDetectorTest : public BrowserWithTestWindowTest {
|
||||
chromeos::FakeVmPluginDispatcherClient* fake_vm_plugin_dispatcher_client_;
|
||||
|
||||
TestCrosUsbDeviceObserver usb_device_observer_;
|
||||
std::unique_ptr<chromeos::CrosUsbDetector> cros_usb_detector_;
|
||||
std::unique_ptr<ash::CrosUsbDetector> cros_usb_detector_;
|
||||
|
||||
std::unique_ptr<crostini::CrostiniTestHelper> crostini_test_helper_;
|
||||
|
||||
@ -304,7 +304,7 @@ TEST_F(CrosUsbDetectorTest, UsbDeviceAddedAndRemoved) {
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
|
||||
absl::optional<message_center::Notification> notification =
|
||||
display_service_->GetNotification(notification_id);
|
||||
@ -327,7 +327,7 @@ TEST_F(CrosUsbDetectorTest, NotificationShown) {
|
||||
auto device = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
0, 1, kManufacturerName, kProductName_1, "002");
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
|
||||
// Notifications should not be shown if no VMs enabled.
|
||||
crostini::FakeCrostiniFeatures crostini_features;
|
||||
@ -371,7 +371,7 @@ TEST_F(CrosUsbDetectorTest, UsbNotificationClicked) {
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
|
||||
absl::optional<message_center::Notification> notification =
|
||||
display_service_->GetNotification(notification_id);
|
||||
@ -396,7 +396,7 @@ TEST_F(CrosUsbDetectorTest, UsbDeviceClassBlockedAdded) {
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ASSERT_FALSE(display_service_->GetNotification(notification_id));
|
||||
EXPECT_EQ(0U, cros_usb_detector_->GetShareableDevices().size());
|
||||
}
|
||||
@ -418,7 +418,7 @@ TEST_F(CrosUsbDetectorTest, UsbDeviceClassAdbAdded) {
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ASSERT_TRUE(display_service_->GetNotification(notification_id));
|
||||
// ADB interface wins.
|
||||
EXPECT_EQ(1U, cros_usb_detector_->GetShareableDevices().size());
|
||||
@ -435,7 +435,7 @@ TEST_F(CrosUsbDetectorTest, UsbDeviceClassWithoutNotificationAdded) {
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ASSERT_FALSE(display_service_->GetNotification(notification_id));
|
||||
EXPECT_EQ(1U, cros_usb_detector_->GetShareableDevices().size());
|
||||
}
|
||||
@ -451,7 +451,7 @@ TEST_F(CrosUsbDetectorTest, UsbDeviceWithoutProductNameAddedAndRemoved) {
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
|
||||
absl::optional<message_center::Notification> notification =
|
||||
display_service_->GetNotification(notification_id);
|
||||
@ -481,7 +481,7 @@ TEST_F(CrosUsbDetectorTest,
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
|
||||
absl::optional<message_center::Notification> notification =
|
||||
display_service_->GetNotification(notification_id);
|
||||
@ -504,7 +504,7 @@ TEST_F(CrosUsbDetectorTest, UsbDeviceWasThereBeforeAndThenRemoved) {
|
||||
base::RunLoop().RunUntilIdle();
|
||||
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
|
||||
EXPECT_FALSE(display_service_->GetNotification(notification_id));
|
||||
|
||||
@ -522,17 +522,17 @@ TEST_F(
|
||||
auto device_1 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
0, 1, kManufacturerName, kProductName_1, "002");
|
||||
std::string notification_id_1 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
|
||||
auto device_2 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
3, 4, kManufacturerName, kProductName_2, "005");
|
||||
std::string notification_id_2 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
|
||||
auto device_3 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
6, 7, kManufacturerName, kProductName_3, "008");
|
||||
std::string notification_id_3 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
|
||||
// Three usb devices were added and removed before cros_usb_detector was
|
||||
// created.
|
||||
@ -573,17 +573,17 @@ TEST_F(CrosUsbDetectorTest,
|
||||
auto device_1 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
0, 1, kManufacturerName, kProductName_1, "002");
|
||||
std::string notification_id_1 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
|
||||
auto device_2 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
3, 4, kManufacturerName, kProductName_2, "005");
|
||||
std::string notification_id_2 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
|
||||
auto device_3 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
6, 7, kManufacturerName, kProductName_3, "008");
|
||||
std::string notification_id_3 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
|
||||
// Three usb devices were added before cros_usb_detector was created.
|
||||
device_manager_.AddDevice(device_1);
|
||||
@ -623,12 +623,12 @@ TEST_F(CrosUsbDetectorTest,
|
||||
auto device_1 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
0, 1, kManufacturerName, kProductName_1, "002");
|
||||
std::string notification_id_1 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
|
||||
auto device_2 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
3, 4, kManufacturerName, kProductName_2, "005");
|
||||
std::string notification_id_2 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
|
||||
// Two usb devices were added before cros_usb_detector was created.
|
||||
device_manager_.AddDevice(device_1);
|
||||
@ -668,17 +668,17 @@ TEST_F(CrosUsbDetectorTest, ThreeUsbDevicesAddedAndRemoved) {
|
||||
auto device_1 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
0, 1, kManufacturerName, kProductName_1, "002");
|
||||
std::string notification_id_1 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
|
||||
auto device_2 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
3, 4, kManufacturerName, kProductName_2, "005");
|
||||
std::string notification_id_2 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
|
||||
auto device_3 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
6, 7, kManufacturerName, kProductName_3, "008");
|
||||
std::string notification_id_3 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
|
||||
ConnectToDeviceManager();
|
||||
base::RunLoop().RunUntilIdle();
|
||||
@ -730,17 +730,17 @@ TEST_F(CrosUsbDetectorTest, ThreeUsbDeviceAddedAndRemovedDifferentOrder) {
|
||||
auto device_1 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
0, 1, kManufacturerName, kProductName_1, "002");
|
||||
std::string notification_id_1 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_1->guid());
|
||||
|
||||
auto device_2 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
3, 4, kManufacturerName, kProductName_2, "005");
|
||||
std::string notification_id_2 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_2->guid());
|
||||
|
||||
auto device_3 = base::MakeRefCounted<device::FakeUsbDeviceInfo>(
|
||||
6, 7, kManufacturerName, kProductName_3, "008");
|
||||
std::string notification_id_3 =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device_3->guid());
|
||||
|
||||
ConnectToDeviceManager();
|
||||
base::RunLoop().RunUntilIdle();
|
||||
@ -914,7 +914,7 @@ TEST_F(CrosUsbDetectorTest, DeviceAllowedInterfacesMaskSetCorrectly) {
|
||||
|
||||
// The device should notify because it has an allowed, notifiable interface.
|
||||
std::string notification_id =
|
||||
chromeos::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
ash::CrosUsbDetector::MakeNotificationId(device->guid());
|
||||
EXPECT_TRUE(display_service_->GetNotification(notification_id));
|
||||
|
||||
EXPECT_EQ(0x00000006U, GetSingleAllowedInterfacesMask());
|
||||
|
@ -31,6 +31,9 @@
|
||||
#include "chrome/browser/ash/system/breakpad_consent_watcher.h"
|
||||
// TODO(https://crbug.com/1164001): forward declare when moved to
|
||||
// chrome/browser/ash/.
|
||||
#include "chrome/browser/ash/usb/cros_usb_detector.h"
|
||||
// TODO(https://crbug.com/1164001): forward declare when moved to
|
||||
// chrome/browser/ash/.
|
||||
#include "chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h"
|
||||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#include "chrome/browser/chromeos/external_metrics.h"
|
||||
@ -74,7 +77,6 @@ class LockToSingleUserManager;
|
||||
namespace chromeos {
|
||||
|
||||
class BulkPrintersCalculatorFactory;
|
||||
class CrosUsbDetector;
|
||||
class EventRewriterDelegateImpl;
|
||||
class FastTransitionObserver;
|
||||
class IdleActionWarningObserver;
|
||||
|
@ -427,4 +427,12 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) CrosDisksClient : public DBusClient {
|
||||
|
||||
} // namespace chromeos
|
||||
|
||||
// TODO(https://crbug.com/1164001): remove when //chromeos/dbus moved to ash.
|
||||
namespace ash {
|
||||
using ::chromeos::MOUNT_ERROR_NONE;
|
||||
using ::chromeos::MOUNT_TYPE_DEVICE;
|
||||
using ::chromeos::MountError;
|
||||
using ::chromeos::MountType;
|
||||
} // namespace ash
|
||||
|
||||
#endif // CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
|
||||
|
@ -259,4 +259,11 @@ class COMPONENT_EXPORT(CHROMEOS_DISKS) DiskMountManager {
|
||||
} // namespace disks
|
||||
} // namespace chromeos
|
||||
|
||||
// TODO(https://crbug.com/1164001): remove when chromeos/disks is moved to ash.
|
||||
namespace ash {
|
||||
namespace disks {
|
||||
using ::chromeos::disks::DiskMountManager;
|
||||
} // namespace disks
|
||||
} // namespace ash
|
||||
|
||||
#endif // CHROMEOS_DISKS_DISK_MOUNT_MANAGER_H_
|
||||
|
Reference in New Issue
Block a user