Remove using directives ("using namespace x") in chrome/browser/sharing/.

Bug: 82078
Change-Id: Iebfc438ca750766748023d2ea2acfc59c3fb2803
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1842960
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Richard Knoll <knollr@chromium.org>
Reviewed-by: Richard Knoll <knollr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703261}

chrome/browser/sharing/ack_message_handler_unittest.cc

@@ -7,26 +7,21 @@
 #include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using SharingMessage = chrome_browser_sharing::SharingMessage;
-using namespace testing;
-
 namespace {
 
-const char kTestMessageId[] = "test_message_id";
-
 class TestObserver : public AckMessageHandler::AckMessageObserver {
  public:
   void OnAckReceived(const std::string& message_id) override {
     received_message_id_ = message_id;
   }
 
-  const std::string& received_message_id() { return received_message_id_; }
+  std::string received_message_id() const { return received_message_id_; }
 
  private:
   std::string received_message_id_;
 };
 
-class AckMessageHandlerTest : public Test {
+class AckMessageHandlerTest : public testing::Test {
  protected:
   AckMessageHandlerTest() { ack_message_handler_.AddObserver(&test_observer_); }
 
@@ -37,7 +32,9 @@ class AckMessageHandlerTest : public Test {
 }  // namespace
 
 TEST_F(AckMessageHandlerTest, OnMessage) {
-  SharingMessage sharing_message;
+  constexpr char kTestMessageId[] = "test_message_id";
+
+  chrome_browser_sharing::SharingMessage sharing_message;
   sharing_message.mutable_ack_message()->set_original_message_id(
       kTestMessageId);
 

chrome/browser/sharing/click_to_call/click_to_call_ui_controller_unittest.cc

@@ -29,9 +29,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using namespace testing;
-using namespace instance_id;
-
 namespace {
 
 const char kPhoneNumber[] = "073%2087%202525%2078";
@@ -93,7 +90,7 @@ class ClickToCallUiControllerTest : public testing::Test {
     SharingServiceFactory::GetInstance()->SetTestingFactory(
         &profile_, base::BindRepeating([](content::BrowserContext* context)
                                            -> std::unique_ptr<KeyedService> {
-          return std::make_unique<NiceMock<MockSharingService>>(
+          return std::make_unique<testing::NiceMock<MockSharingService>>(
               std::make_unique<SharingFCMHandler>(nullptr, nullptr, nullptr));
         }));
     ClickToCallUiController::ShowDialog(
@@ -103,8 +100,8 @@ class ClickToCallUiControllerTest : public testing::Test {
   }
 
  protected:
-  NiceMock<MockSharingService>* service() {
-    return static_cast<NiceMock<MockSharingService>*>(
+  testing::NiceMock<MockSharingService>* service() {
+    return static_cast<testing::NiceMock<MockSharingService>*>(
         SharingServiceFactory::GetForBrowserContext(&profile_));
   }
 
@@ -135,15 +132,15 @@ TEST_F(ClickToCallUiControllerTest, OnDeviceChosen) {
   sharing_message.mutable_click_to_call_message()->set_phone_number(
       kExpectedPhoneNumber);
   EXPECT_CALL(*service(),
-              SendMessageToDevice(Eq(kReceiverGuid), Eq(kSharingMessageTTL),
-                                  ProtoEquals(sharing_message), _));
+              SendMessageToDevice(testing::Eq(kReceiverGuid),
+                                  testing::Eq(kSharingMessageTTL),
+                                  ProtoEquals(sharing_message), testing::_));
   controller_->OnDeviceChosen(device_info);
 }
 
 // Check the call to sharing service to get all synced devices.
 TEST_F(ClickToCallUiControllerTest, GetSyncedDevices) {
-  EXPECT_CALL(
-      *service(),
-      GetDeviceCandidates(Eq(sync_pb::SharingSpecificFields::CLICK_TO_CALL)));
+  EXPECT_CALL(*service(), GetDeviceCandidates(testing::Eq(
+                              sync_pb::SharingSpecificFields::CLICK_TO_CALL)));
   controller_->UpdateAndShowDialog();
 }

chrome/browser/sharing/shared_clipboard/shared_clipboard_ui_controller_unittest.cc

@@ -29,9 +29,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using namespace testing;
-using namespace instance_id;
-
 namespace {
 
 const char kText[] = "Text to be copied";
@@ -93,7 +90,7 @@ class SharedClipboardUiControllerTest : public testing::Test {
     SharingServiceFactory::GetInstance()->SetTestingFactory(
         &profile_, base::BindRepeating([](content::BrowserContext* context)
                                            -> std::unique_ptr<KeyedService> {
-          return std::make_unique<NiceMock<MockSharingService>>(
+          return std::make_unique<testing::NiceMock<MockSharingService>>(
               std::make_unique<SharingFCMHandler>(nullptr, nullptr, nullptr));
         }));
     syncer::DeviceInfo device_info(
@@ -108,8 +105,8 @@ class SharedClipboardUiControllerTest : public testing::Test {
   }
 
  protected:
-  NiceMock<MockSharingService>* service() {
-    return static_cast<NiceMock<MockSharingService>*>(
+  testing::NiceMock<MockSharingService>* service() {
+    return static_cast<testing::NiceMock<MockSharingService>*>(
         SharingServiceFactory::GetForBrowserContext(&profile_));
   }
 
@@ -139,15 +136,16 @@ TEST_F(SharedClipboardUiControllerTest, OnDeviceChosen) {
   chrome_browser_sharing::SharingMessage sharing_message;
   sharing_message.mutable_shared_clipboard_message()->set_text(kExpectedText);
   EXPECT_CALL(*service(),
-              SendMessageToDevice(Eq(kReceiverGuid), Eq(kSharingMessageTTL),
-                                  ProtoEquals(sharing_message), _));
+              SendMessageToDevice(testing::Eq(kReceiverGuid),
+                                  testing::Eq(kSharingMessageTTL),
+                                  ProtoEquals(sharing_message), testing::_));
   controller_->OnDeviceChosen(device_info);
 }
 
 // Check the call to sharing service to get all synced devices.
 TEST_F(SharedClipboardUiControllerTest, GetSyncedDevices) {
   EXPECT_CALL(*service(),
-              GetDeviceCandidates(
-                  Eq(sync_pb::SharingSpecificFields::SHARED_CLIPBOARD)));
+              GetDeviceCandidates(testing::Eq(
+                  sync_pb::SharingSpecificFields::SHARED_CLIPBOARD)));
   controller_->UpdateAndShowDialog();
 }

chrome/browser/sharing/sharing_device_registration_unittest.cc

@@ -31,10 +31,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace gcm;
-using namespace instance_id;
-using namespace testing;
-
 namespace {
 const char kAppID[] = "test_app_id";
 const char kFCMToken[] = "test_fcm_token";
@@ -44,18 +40,19 @@ const char kDevicep256dh2[] = "test_p256_dh_2";
 const char kDeviceAuthSecret[] = "test_auth_secret";
 const char kDeviceAuthSecret2[] = "test_auth_secret_2";
 
-class MockInstanceIDDriver : public InstanceIDDriver {
+class MockInstanceIDDriver : public instance_id::InstanceIDDriver {
  public:
   MockInstanceIDDriver() : InstanceIDDriver(/*gcm_driver=*/nullptr) {}
   ~MockInstanceIDDriver() override = default;
 
-  MOCK_METHOD1(GetInstanceID, InstanceID*(const std::string& app_id));
+  MOCK_METHOD1(GetInstanceID,
+               instance_id::InstanceID*(const std::string& app_id));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockInstanceIDDriver);
 };
 
-class FakeInstanceID : public InstanceID {
+class FakeInstanceID : public instance_id::InstanceID {
  public:
   FakeInstanceID() : InstanceID(kAppID, /*gcm_driver = */ nullptr) {}
   ~FakeInstanceID() override = default;
@@ -139,7 +136,7 @@ class SharingDeviceRegistrationTest : public testing::Test {
   }
 
   void SetUp() {
-    ON_CALL(mock_instance_id_driver_, GetInstanceID(_))
+    ON_CALL(mock_instance_id_driver_, GetInstanceID(testing::_))
         .WillByDefault(testing::Return(&fake_instance_id_));
   }
 
@@ -183,7 +180,7 @@ class SharingDeviceRegistrationTest : public testing::Test {
     run_loop.Run();
   }
 
-  void SetInstanceIDFCMResult(InstanceID::Result result) {
+  void SetInstanceIDFCMResult(instance_id::InstanceID::Result result) {
     fake_instance_id_.SetFCMResult(result);
   }
 
@@ -208,7 +205,7 @@ class SharingDeviceRegistrationTest : public testing::Test {
       base::test::TaskEnvironment::TimeSource::MOCK_TIME};
 
   sync_preferences::TestingPrefServiceSyncable prefs_;
-  NiceMock<MockInstanceIDDriver> mock_instance_id_driver_;
+  testing::NiceMock<MockInstanceIDDriver> mock_instance_id_driver_;
   syncer::FakeDeviceInfoSyncService fake_device_info_sync_service_;
   FakeInstanceID fake_instance_id_;
 
@@ -243,7 +240,7 @@ TEST_F(SharingDeviceRegistrationTest, IsSharedClipboardSupported_False) {
 }
 
 TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_Success) {
-  SetInstanceIDFCMResult(InstanceID::Result::SUCCESS);
+  SetInstanceIDFCMResult(instance_id::InstanceID::Result::SUCCESS);
   SetInstanceIDFCMToken(kFCMToken);
   fake_device_info_sync_service_.GetDeviceInfoTracker()->Add(
       fake_device_info_sync_service_.GetLocalDeviceInfoProvider()
@@ -280,7 +277,7 @@ TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_Success) {
 
 TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_VapidKeysUnchanged) {
   SetInstanceIDFCMToken(kFCMToken);
-  SetInstanceIDFCMResult(InstanceID::Result::SUCCESS);
+  SetInstanceIDFCMResult(instance_id::InstanceID::Result::SUCCESS);
   fake_device_info_sync_service_.GetDeviceInfoTracker()->Add(
       fake_device_info_sync_service_.GetLocalDeviceInfoProvider()
           ->GetLocalDeviceInfo());
@@ -310,7 +307,7 @@ TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_VapidKeysUnchanged) {
 }
 
 TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_Expired) {
-  SetInstanceIDFCMResult(InstanceID::Result::SUCCESS);
+  SetInstanceIDFCMResult(instance_id::InstanceID::Result::SUCCESS);
   fake_device_info_sync_service_.GetDeviceInfoTracker()->Add(
       fake_device_info_sync_service_.GetLocalDeviceInfoProvider()
           ->GetLocalDeviceInfo());
@@ -340,7 +337,7 @@ TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_Expired) {
 }
 
 TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_NetworkError) {
-  SetInstanceIDFCMResult(InstanceID::Result::NETWORK_ERROR);
+  SetInstanceIDFCMResult(instance_id::InstanceID::Result::NETWORK_ERROR);
 
   RegisterDeviceSync();
 
@@ -351,7 +348,7 @@ TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_NetworkError) {
 }
 
 TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_FatalError) {
-  SetInstanceIDFCMResult(InstanceID::Result::DISABLED);
+  SetInstanceIDFCMResult(instance_id::InstanceID::Result::DISABLED);
 
   RegisterDeviceSync();
 
@@ -362,7 +359,7 @@ TEST_F(SharingDeviceRegistrationTest, RegisterDeviceTest_FatalError) {
 }
 
 TEST_F(SharingDeviceRegistrationTest, UnregisterDeviceTest_Success) {
-  SetInstanceIDFCMResult(InstanceID::Result::SUCCESS);
+  SetInstanceIDFCMResult(instance_id::InstanceID::Result::SUCCESS);
   fake_device_info_sync_service_.GetDeviceInfoTracker()->Add(
       fake_device_info_sync_service_.GetLocalDeviceInfoProvider()
           ->GetLocalDeviceInfo());

chrome/browser/sharing/sharing_fcm_handler_unittest.cc

@@ -16,9 +16,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using RecipientInfo = chrome_browser_sharing::RecipientInfo;
+using testing::_;
 using SharingMessage = chrome_browser_sharing::SharingMessage;
-using namespace testing;
 
 namespace {
 
@@ -55,7 +54,7 @@ class MockSharingFCMSender : public SharingFCMSender {
                     SendMessageCallback callback));
 };
 
-class SharingFCMHandlerTest : public Test {
+class SharingFCMHandlerTest : public testing::Test {
  protected:
   SharingFCMHandlerTest() {
     sync_prefs_ = std::make_unique<SharingSyncPreference>(
@@ -82,8 +81,8 @@ class SharingFCMHandlerTest : public Test {
     sharing_message.SerializeToString(&incoming_message.raw_data);
     return incoming_message;
   }
-  NiceMock<MockSharingMessageHandler> mock_sharing_message_handler_;
-  NiceMock<MockSharingFCMSender> mock_sharing_fcm_sender_;
+  testing::NiceMock<MockSharingMessageHandler> mock_sharing_message_handler_;
+  testing::NiceMock<MockSharingFCMSender> mock_sharing_fcm_sender_;
 
   gcm::FakeGCMDriver fake_gcm_driver_;
   std::unique_ptr<SharingFCMHandler> sharing_fcm_handler_;
@@ -153,7 +152,7 @@ TEST_F(SharingFCMHandlerTest, PingMessageHandler) {
   EXPECT_CALL(mock_sharing_message_handler_,
               OnMessage(ProtoEquals(sharing_message)));
   EXPECT_CALL(mock_sharing_fcm_sender_,
-              SendMessageToDevice(DeviceMatcher(), Eq(kAckTimeToLive),
+              SendMessageToDevice(DeviceMatcher(), testing::Eq(kAckTimeToLive),
                                   ProtoEquals(sharing_ack_message), _));
   sharing_fcm_handler_->AddSharingHandler(SharingMessage::kPingMessage,
                                           &mock_sharing_message_handler_);
@@ -188,7 +187,7 @@ TEST_F(SharingFCMHandlerTest, PingMessageHandlerSecondaryUser) {
   EXPECT_CALL(mock_sharing_message_handler_,
               OnMessage(ProtoEquals(sharing_message)));
   EXPECT_CALL(mock_sharing_fcm_sender_,
-              SendMessageToDevice(DeviceMatcher(), Eq(kAckTimeToLive),
+              SendMessageToDevice(DeviceMatcher(), testing::Eq(kAckTimeToLive),
                                   ProtoEquals(sharing_ack_message), _));
   sharing_fcm_handler_->AddSharingHandler(SharingMessage::kPingMessage,
                                           &mock_sharing_message_handler_);
@@ -201,7 +200,8 @@ TEST_F(SharingFCMHandlerTest, PingMessageHandlerWithRecipientInfo) {
   SharingMessage sharing_message;
   sharing_message.set_sender_guid(kSenderGuid);
   sharing_message.mutable_ping_message();
-  RecipientInfo* sender_info = sharing_message.mutable_sender_info();
+  chrome_browser_sharing::RecipientInfo* sender_info =
+      sharing_message.mutable_sender_info();
   sender_info->set_fcm_token(kFCMToken);
   sender_info->set_p256dh(kP256dh);
   sender_info->set_auth_secret(kAuthSecret);
@@ -215,7 +215,7 @@ TEST_F(SharingFCMHandlerTest, PingMessageHandlerWithRecipientInfo) {
   EXPECT_CALL(mock_sharing_message_handler_,
               OnMessage(ProtoEquals(sharing_message)));
   EXPECT_CALL(mock_sharing_fcm_sender_,
-              SendMessageToDevice(DeviceMatcher(), Eq(kAckTimeToLive),
+              SendMessageToDevice(DeviceMatcher(), testing::Eq(kAckTimeToLive),
                                   ProtoEquals(sharing_ack_message), _));
   sharing_fcm_handler_->AddSharingHandler(SharingMessage::kPingMessage,
                                           &mock_sharing_message_handler_);

chrome/browser/sharing/sharing_fcm_sender_unittest.cc

@@ -19,10 +19,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using RecipientInfo = chrome_browser_sharing::RecipientInfo;
-using SharingMessage = chrome_browser_sharing::SharingMessage;
-using namespace testing;
-
 namespace {
 
 const char kMessageId[] = "message_id";
@@ -86,7 +82,7 @@ class MockVapidKeyManager : public VapidKeyManager {
   MOCK_METHOD0(GetOrCreateKey, crypto::ECPrivateKey*());
 };
 
-class SharingFCMSenderTest : public Test {
+class SharingFCMSenderTest : public testing::Test {
  public:
   void OnMessageSent(SharingSendMessageResult* result_out,
                      base::Optional<std::string>* message_id_out,
@@ -113,7 +109,7 @@ class SharingFCMSenderTest : public Test {
 
   std::unique_ptr<SharingSyncPreference> sync_prefs_;
   std::unique_ptr<SharingFCMSender> sharing_fcm_sender_;
-  NiceMock<MockVapidKeyManager> vapid_key_manager_;
+  testing::NiceMock<MockVapidKeyManager> vapid_key_manager_;
 
  private:
   sync_preferences::TestingPrefServiceSyncable prefs_;
@@ -177,7 +173,7 @@ TEST_P(SharingFCMSenderResultTest, ResultTest) {
   std::unique_ptr<crypto::ECPrivateKey> vapid_key =
       crypto::ECPrivateKey::Create();
   ON_CALL(vapid_key_manager_, GetOrCreateKey())
-      .WillByDefault(Return(vapid_key.get()));
+      .WillByDefault(testing::Return(vapid_key.get()));
 
   syncer::DeviceInfo::SharingInfo target(
       kFcmToken, kP256dh, kAuthSecret,
@@ -185,7 +181,7 @@ TEST_P(SharingFCMSenderResultTest, ResultTest) {
 
   SharingSendMessageResult result;
   base::Optional<std::string> message_id;
-  SharingMessage sharing_message;
+  chrome_browser_sharing::SharingMessage sharing_message;
   sharing_message.mutable_ping_message();
   sharing_fcm_sender_->SendMessageToDevice(
       std::move(target), base::TimeDelta::FromSeconds(kTtlSeconds),
@@ -205,7 +201,7 @@ TEST_P(SharingFCMSenderResultTest, ResultTest) {
   EXPECT_EQ(kTtlSeconds, fake_gcm_driver_.message().time_to_live);
   EXPECT_EQ(gcm::WebPushMessage::Urgency::kHigh,
             fake_gcm_driver_.message().urgency);
-  SharingMessage message_sent;
+  chrome_browser_sharing::SharingMessage message_sent;
   message_sent.ParseFromString(fake_gcm_driver_.message().payload);
   EXPECT_EQ(local_device_info->guid(), message_sent.sender_guid());
   EXPECT_TRUE(message_sent.has_ping_message());

chrome/browser/sharing/sharing_service_unittest.cc

@@ -33,10 +33,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::test::TaskEnvironment;
-using namespace instance_id;
-using namespace testing;
-
 namespace {
 
 const char kP256dh[] = "p256dh";
@@ -88,7 +84,7 @@ class FakeGCMDriver : public gcm::FakeGCMDriver {
   bool should_respond_ = true;
 };
 
-class MockInstanceIDDriver : public InstanceIDDriver {
+class MockInstanceIDDriver : public instance_id::InstanceIDDriver {
  public:
   MockInstanceIDDriver() : InstanceIDDriver(/*gcm_driver=*/nullptr) {}
   ~MockInstanceIDDriver() override = default;
@@ -188,7 +184,7 @@ class SharingServiceTest : public testing::Test {
         &fake_gcm_driver_,
         fake_device_info_sync_service.GetLocalDeviceInfoProvider(), sync_prefs_,
         vapid_key_manager_);
-    fcm_handler_ = new NiceMock<MockSharingFCMHandler>();
+    fcm_handler_ = new testing::NiceMock<MockSharingFCMHandler>();
     SharingSyncPreference::RegisterProfilePrefs(prefs_.registry());
   }
 
@@ -243,15 +239,15 @@ class SharingServiceTest : public testing::Test {
 
   base::test::ScopedFeatureList scoped_feature_list_;
   content::BrowserTaskEnvironment task_environment_{
-      TaskEnvironment::TimeSource::MOCK_TIME};
+      base::test::TaskEnvironment::TimeSource::MOCK_TIME};
 
   syncer::FakeDeviceInfoSyncService fake_device_info_sync_service;
   syncer::TestSyncService test_sync_service_;
   sync_preferences::TestingPrefServiceSyncable prefs_;
   FakeGCMDriver fake_gcm_driver_;
 
-  NiceMock<MockInstanceIDDriver> mock_instance_id_driver_;
-  NiceMock<MockSharingFCMHandler>* fcm_handler_;
+  testing::NiceMock<MockInstanceIDDriver> mock_instance_id_driver_;
+  testing::NiceMock<MockSharingFCMHandler>* fcm_handler_;
 
   SharingSyncPreference* sync_prefs_;
   VapidKeyManager* vapid_key_manager_;