Convert string16 to base::string16 in content.

content/common/android/address_parser.h

Index: content/common/android/address_parser.h
diff --git a/content/common/android/address_parser.h b/content/common/android/address_parser.h
index 71a3aba77d4a9dc121e42fa78d0539a31a1146c9..1a12a32c14d3a947cb84932cf533819be00e2945 100644
--- a/content/common/android/address_parser.h
+++ b/content/common/android/address_parser.h
@@ -17,14 +17,14 @@ namespace address_parser {
 // Find the first address in some chunk of text.  If an address is found in
 // |text| true is returned and the address is copied into |address|.
 // Otherwise, false is returned.
-bool FindAddress(const string16& text, string16* address);
+bool FindAddress(const base::string16& text, base::string16* address);
 
 // Find the first address in some chunk of test.  |begin| is the starting
 // position to search from, |end| is the position to search to.  |start_pos|
 // and |end_pos| are set to the starting and ending position of the address,
 // if found.
-CONTENT_EXPORT bool FindAddress(const string16::const_iterator& begin,
-                                const string16::const_iterator& end,
+CONTENT_EXPORT bool FindAddress(const base::string16::const_iterator& begin,
+                                const base::string16::const_iterator& end,
                                 size_t* start_pos,
                                 size_t* end_pos);