Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_area.h

 // 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.
 
 #ifndef WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 #define WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/nullable_string16.h"
-#include "base/string16.h"
+#include "base/nullable_base::string16.h"

[jamesr, 2013/03/28 21:03:00]

this also looks wrong

+#include "base/string16.h.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
 class DomStorageDatabaseAdapter;
 class DomStorageMap;
 class DomStorageTaskRunner;
 class SessionStorageDatabase;
@@ skipping 22 matching lines @@
                  DomStorageTaskRunner* task_runner);
 
   const GURL& origin() const { return origin_; }
   int64 namespace_id() const { return namespace_id_; }
 
   // Writes a copy of the current set of values in the area to the |map|.
   void ExtractValues(ValuesMap* map);
 
   unsigned Length();
   NullableString16 Key(unsigned index);
-  NullableString16 GetItem(const string16& key);
-  bool SetItem(const string16& key, const string16& value,
+  NullableString16 GetItem(const base::string16& key);
+  bool SetItem(const base::string16& key, const base::string16& value,
                NullableString16* old_value);
-  bool RemoveItem(const string16& key, string16* old_value);
+  bool RemoveItem(const base::string16& key, base::string16* old_value);
   bool Clear();
   void FastClear();
 
   DomStorageArea* ShallowCopy(
       int64 destination_namespace_id,
       const std::string& destination_persistent_namespace_id);
 
   bool HasUncommittedChanges() const;
 
   // Similar to Clear() but more optimized for just deleting
@@ skipping 56 matching lines @@
   scoped_refptr<SessionStorageDatabase> session_storage_backing_;
   bool is_initial_import_done_;
   bool is_shutdown_;
   scoped_ptr<CommitBatch> commit_batch_;
   int commit_batches_in_flight_;
 };
 
 }  // namespace dom_storage
 
 #endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_