Convert string16 -> base::string16 in components/

components/webdata/autofill/web_data_service_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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
@@ skipping 131 matching lines @@
         &AutofillWebDataService::RemoveObserver;
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(remove_observer_func, wds_, &observer_));
     WaitForDatabaseThread();
 
     WebDataServiceTest::TearDown();
   }
 
-  void AppendFormField(const string16& name,
-                       const string16& value,
+  void AppendFormField(const base::string16& name,
+                       const base::string16& value,
                        std::vector<FormFieldData>* form_fields) {
     FormFieldData field;
     field.name = name;
     field.value = value;
     form_fields->push_back(field);
   }
 
-  string16 name1_;
-  string16 name2_;
-  string16 value1_;
-  string16 value2_;
+  base::string16 name1_;
+  base::string16 name2_;
+  base::string16 value1_;
+  base::string16 value2_;
   int unique_id1_, unique_id2_;
   const TimeDelta test_timeout_;
   testing::NiceMock<MockAutofillWebDataServiceObserver> observer_;
   WaitableEvent done_event_;
 };
 
 // Simple consumer for Keywords data. Stores the result data and quits UI
 // message loop when callback is invoked.
 class KeywordsConsumer : public WebDataServiceConsumer {
  public:
@@ skipping 33 matching lines @@
       .WillOnce(SignalEvent(&done_event_));
 
   std::vector<FormFieldData> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   AppendFormField(name2_, value2_, &form_fields);
   wds_->AddFormFields(form_fields);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 
-  AutofillWebDataServiceConsumer<std::vector<string16> > consumer;
+  AutofillWebDataServiceConsumer<std::vector<base::string16> > consumer;
   WebDataService::Handle handle;
   static const int limit = 10;
   handle = wds_->GetFormValuesForElementName(
-      name1_, string16(), limit, &consumer);
+      name1_, base::string16(), limit, &consumer);
 
   // The message loop will exit when the consumer is called.
   MessageLoop::current()->Run();
 
   EXPECT_EQ(handle, consumer.handle());
   ASSERT_EQ(1U, consumer.result().size());
   EXPECT_EQ(value1_, consumer.result()[0]);
 }
 
 TEST_F(WebDataServiceAutofillTest, FormFillRemoveOne) {
@@ skipping 290 matching lines @@
   EXPECT_EQ(handle2, profile_consumer2.handle());
   ASSERT_EQ(0U, profile_consumer2.result().size());
 
   // Check that the credit card was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > card_consumer2;
   handle2 = wds_->GetCreditCards(&card_consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, card_consumer2.handle());
   ASSERT_EQ(0U, card_consumer2.result().size());
 }