Replace string16 with base::string16.

chrome/browser/browsing_data/cookies_tree_model_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/browsing_data/cookies_tree_model.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 378 matching lines @@
   mock_browsing_data_database_helper_->Reset();
   mock_browsing_data_local_storage_helper_->Reset();
   mock_browsing_data_session_storage_helper_->Reset();
   mock_browsing_data_indexed_db_helper_->Reset();
   mock_browsing_data_file_system_helper_->Reset();
 
   cookies_model->DeleteAllStoredObjects();
 
   // Make sure the nodes are also deleted from the model's cache.
   // http://crbug.com/43249
-  cookies_model->UpdateSearchResults(string16());
+  cookies_model->UpdateSearchResults(base::string16());
 
   {
     // 2 nodes - root and app
     SCOPED_TRACE("After removing");
     EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
     EXPECT_EQ(0, cookies_model->GetRoot()->child_count());
     EXPECT_EQ(std::string(), GetDisplayedCookies(cookies_model.get()));
     EXPECT_TRUE(mock_browsing_data_cookie_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_database_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_local_storage_helper_->AllDeleted());
@@ skipping 730 matching lines @@
             GetDisplayedFileSystems(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost2"));
   EXPECT_EQ("http://fshost2:2/",
             GetDisplayedFileSystems(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost3"));
   EXPECT_EQ("http://fshost3:3/",
             GetDisplayedFileSystems(cookies_model.get()));
 
-  cookies_model->UpdateSearchResults(string16());
+  cookies_model->UpdateSearchResults(base::string16());
   EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
             GetDisplayedFileSystems(cookies_model.get()));
 }
 
 TEST_F(CookiesTreeModelTest, CookiesFilter) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
@@ skipping 10 matching lines @@
       AddCookieSamples(GURL("http://123.com"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1.com"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2.com"), "C=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3.com"), "D=1");
   mock_browsing_data_cookie_helper_->Notify();
   EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
 
-  cookies_model.UpdateSearchResults(string16(ASCIIToUTF16("foo")));
+  cookies_model.UpdateSearchResults(base::string16(ASCIIToUTF16("foo")));
   EXPECT_EQ("B,C,D", GetDisplayedCookies(&cookies_model));
 
-  cookies_model.UpdateSearchResults(string16(ASCIIToUTF16("2")));
+  cookies_model.UpdateSearchResults(base::string16(ASCIIToUTF16("2")));
   EXPECT_EQ("A,C", GetDisplayedCookies(&cookies_model));
 
-  cookies_model.UpdateSearchResults(string16(ASCIIToUTF16("foo3")));
+  cookies_model.UpdateSearchResults(base::string16(ASCIIToUTF16("foo3")));
   EXPECT_EQ("D", GetDisplayedCookies(&cookies_model));
 
-  cookies_model.UpdateSearchResults(string16());
+  cookies_model.UpdateSearchResults(base::string16());
   EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
 }
 
 }  // namespace