Convert string16 to base::string16 in content.

content/browser/frame_host/navigation_entry_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 118 matching lines @@
   EXPECT_EQ(PAGE_TYPE_INTERSTITIAL, entry2_->GetPageType());
 
   // Referrer
   EXPECT_EQ(GURL(), entry1_->GetReferrer().url);
   EXPECT_EQ(GURL("from"), entry2_->GetReferrer().url);
   entry2_->SetReferrer(
       Referrer(GURL("from2"), blink::WebReferrerPolicyDefault));
   EXPECT_EQ(GURL("from2"), entry2_->GetReferrer().url);
 
   // Title
-  EXPECT_EQ(string16(), entry1_->GetTitle());
+  EXPECT_EQ(base::string16(), entry1_->GetTitle());
   EXPECT_EQ(ASCIIToUTF16("title"), entry2_->GetTitle());
   entry2_->SetTitle(ASCIIToUTF16("title2"));
   EXPECT_EQ(ASCIIToUTF16("title2"), entry2_->GetTitle());
 
   // State
   EXPECT_FALSE(entry1_->GetPageState().IsValid());
   EXPECT_FALSE(entry2_->GetPageState().IsValid());
   entry2_->SetPageState(PageState::CreateFromEncodedData("state"));
   EXPECT_EQ("state", entry2_->GetPageState().ToEncodedData());
 
@@ skipping 62 matching lines @@
 // Test timestamps.
 TEST_F(NavigationEntryTest, NavigationEntryTimestamps) {
   EXPECT_EQ(base::Time(), entry1_->GetTimestamp());
   const base::Time now = base::Time::Now();
   entry1_->SetTimestamp(now);
   EXPECT_EQ(now, entry1_->GetTimestamp());
 }
 
 // Test extra data stored in the navigation entry.
 TEST_F(NavigationEntryTest, NavigationEntryExtraData) {
-  string16 test_data = ASCIIToUTF16("my search terms");
-  string16 output;
+  base::string16 test_data = ASCIIToUTF16("my search terms");
+  base::string16 output;
   entry1_->SetExtraData("search_terms", test_data);
 
   EXPECT_FALSE(entry1_->GetExtraData("non_existent_key", &output));
   EXPECT_EQ(ASCIIToUTF16(""), output);
   EXPECT_TRUE(entry1_->GetExtraData("search_terms", &output));
   EXPECT_EQ(test_data, output);
   // Data is cleared.
   entry1_->ClearExtraData("search_terms");
   // Content in |output| is not modified if data is not present at the key.
   EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output));
   EXPECT_EQ(test_data, output);
   // Using an empty string shows that the data is not present in the map.
-  string16 output2;
+  base::string16 output2;
   EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output2));
   EXPECT_EQ(ASCIIToUTF16(""), output2);
 }
 
 }  // namespace content