Replace string16 with base::string16 in src/webkit

webkit/database/database_quota_client_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 <map>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 14 matching lines @@
 // Mock tracker class the mocks up those methods of the tracker
 // that are used by the QuotaClient.
 class MockDatabaseTracker : public DatabaseTracker {
  public:
   MockDatabaseTracker()
       : DatabaseTracker(base::FilePath(), false, NULL, NULL, NULL),
         delete_called_count_(0),
         async_delete_(false) {}
 
   virtual bool GetOriginInfo(
-      const string16& origin_identifier,
+      const base::string16& origin_identifier,
       OriginInfo* info) OVERRIDE {
     std::map<GURL, MockOriginInfo>::const_iterator found =
         mock_origin_infos_.find(
             DatabaseUtil::GetOriginFromIdentifier(origin_identifier));
     if (found == mock_origin_infos_.end())
       return false;
     *info = OriginInfo(found->second);
     return true;
   }
 
   virtual bool GetAllOriginIdentifiers(
-      std::vector<string16>* origins_identifiers) OVERRIDE {
+      std::vector<base::string16>* origins_identifiers) OVERRIDE {
     std::map<GURL, MockOriginInfo>::const_iterator iter;
     for (iter = mock_origin_infos_.begin();
          iter != mock_origin_infos_.end();
          ++iter) {
       origins_identifiers->push_back(iter->second.GetOrigin());
     }
     return true;
   }
 
   virtual bool GetAllOriginsInfo(
       std::vector<OriginInfo>* origins_info) OVERRIDE {
     std::map<GURL, MockOriginInfo>::const_iterator iter;
     for (iter = mock_origin_infos_.begin();
          iter != mock_origin_infos_.end();
          ++iter) {
       origins_info->push_back(OriginInfo(iter->second));
     }
     return true;
   }
 
   virtual int DeleteDataForOrigin(
-      const string16& origin_id,
+      const base::string16& origin_id,
       const net::CompletionCallback& callback) OVERRIDE {
     ++delete_called_count_;
     if (async_delete()) {
       base::MessageLoopProxy::current()->PostTask(
           FROM_HERE,
           base::Bind(&MockDatabaseTracker::AsyncDeleteDataForOrigin, this,
                      callback));
       return net::ERR_IO_PENDING;
     }
     return net::OK;
@@ skipping 12 matching lines @@
   int delete_called_count() { return delete_called_count_; }
   bool async_delete() { return async_delete_; }
   void set_async_delete(bool async) { async_delete_ = async; }
 
  protected:
   virtual ~MockDatabaseTracker() {}
 
  private:
   class MockOriginInfo : public OriginInfo {
    public:
-    void set_origin(const string16& origin_id) {
+    void set_origin(const base::string16& origin_id) {
       origin_ = origin_id;
     }
 
-    void AddMockDatabase(const string16& name, int size) {
+    void AddMockDatabase(const base::string16& name, int size) {
       EXPECT_TRUE(database_info_.find(name) == database_info_.end());
       database_info_[name].first = size;
       total_size_ += size;
     }
   };
 
   int delete_called_count_;
   bool async_delete_;
   std::map<GURL, MockOriginInfo> mock_origin_infos_;
 };
@@ skipping 165 matching lines @@
   mock_tracker()->set_async_delete(false);
   EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
   EXPECT_EQ(1, mock_tracker()->delete_called_count());
 
   mock_tracker()->set_async_delete(true);
   EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
   EXPECT_EQ(2, mock_tracker()->delete_called_count());
 }
 
 }  // namespace webkit_database