From 1b21b9bbf8e9d3911dba39ab09ee3d3398975c49 Mon Sep 17 00:00:00 2001
From: ehmaldonado <ehmaldonado@webrtc.org>
Date: Tue, 7 Feb 2017 03:40:28 -0800
Subject: [PATCH] Replace occurences of string by std::string.

BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2685533002
Cr-Commit-Position: refs/heads/master@{#16463}
---
 webrtc/base/base64_unittest.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webrtc/base/base64_unittest.cc b/webrtc/base/base64_unittest.cc
index 6bc0a122f1..96bc69582e 100644
--- a/webrtc/base/base64_unittest.cc
+++ b/webrtc/base/base64_unittest.cc
@@ -345,7 +345,7 @@ size_t Base64Unescape(const char *src, size_t szsrc, char *dest,
   return unescaped.size();
 }
 
-size_t Base64Unescape(const char *src, size_t szsrc, string *s) {
+size_t Base64Unescape(const char *src, size_t szsrc, std::string *s) {
   EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, s, NULL));
   return s->size();
 }
@@ -417,7 +417,7 @@ TEST(Base64, EncodeDecodeBattery) {
 
       // Try chopping off the equals sign(s) entirely.  The decoder
       // should still be okay with this.
-      string decoded2("this junk should also be ignored");
+      std::string decoded2("this junk should also be ignored");
       *first_equals = '\0';
       EXPECT_NE(0U, Base64Unescape(encode_buffer, first_equals-encode_buffer,
                            &decoded2));