diff --git a/p2p_manager_unittest.cc b/p2p_manager_unittest.cc
index fb582f9..9af5458 100644
--- a/p2p_manager_unittest.cc
+++ b/p2p_manager_unittest.cc
@@ -27,10 +27,9 @@
 #include "update_engine/test_utils.h"
 #include "update_engine/utils.h"
 
+using base::TimeDelta;
 using std::string;
 using std::unique_ptr;
-using std::vector;
-using base::TimeDelta;
 
 namespace chromeos_update_engine {
 
@@ -159,7 +158,7 @@
       new policy::MockDevicePolicy());
   // We return an empty owner as this is an enterprise.
   EXPECT_CALL(*device_policy, GetOwner(testing::_)).WillRepeatedly(
-      DoAll(testing::SetArgumentPointee<0>(std::string("")),
+      DoAll(testing::SetArgumentPointee<0>(string("")),
             testing::Return(true)));
   manager->SetDevicePolicy(device_policy.get());
   EXPECT_TRUE(manager->IsP2PEnabled());
@@ -184,7 +183,7 @@
       new policy::MockDevicePolicy());
   // We return an empty owner as this is an enterprise.
   EXPECT_CALL(*device_policy, GetOwner(testing::_)).WillRepeatedly(
-      DoAll(testing::SetArgumentPointee<0>(std::string("")),
+      DoAll(testing::SetArgumentPointee<0>(string("")),
             testing::Return(true)));
   // Make Enterprise Policy indicate p2p is not enabled.
   EXPECT_CALL(*device_policy, GetAuP2PEnabled(testing::_)).WillRepeatedly(