Move nullable_string16.h to the string subdirectory.

webkit/common/dom_storage/dom_storage_map.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 "webkit/common/dom_storage/dom_storage_map.h"
 
 #include "base/logging.h"
 
 namespace {
 
@@ skipping 21 matching lines @@
       quota_(quota) {
   ResetKeyIterator();
 }
 
 DomStorageMap::~DomStorageMap() {}
 
 unsigned DomStorageMap::Length() const {
   return values_.size();
 }
 
-NullableString16 DomStorageMap::Key(unsigned index) {
+base::NullableString16 DomStorageMap::Key(unsigned index) {
   if (index >= values_.size())
-    return NullableString16(true);
+    return base::NullableString16(true);
   while (last_key_index_ != index) {
     if (last_key_index_ > index) {
       --key_iterator_;
       --last_key_index_;
     } else {
       ++key_iterator_;
       ++last_key_index_;
     }
   }
-  return NullableString16(key_iterator_->first, false);
+  return base::NullableString16(key_iterator_->first, false);
 }
 
-NullableString16 DomStorageMap::GetItem(const base::string16& key) const {
+base::NullableString16 DomStorageMap::GetItem(const base::string16& key) const {
   ValuesMap::const_iterator found = values_.find(key);
   if (found == values_.end())
-    return NullableString16(true);
+    return base::NullableString16(true);
   return found->second;
 }
 
 bool DomStorageMap::SetItem(
     const base::string16& key, const base::string16& value,
-    NullableString16* old_value) {
+    base::NullableString16* old_value) {
   ValuesMap::const_iterator found = values_.find(key);
   if (found == values_.end())
-    *old_value = NullableString16(true);
+    *old_value = base::NullableString16(true);
   else
     *old_value = found->second;
 
   size_t old_item_size = old_value->is_null() ?
       0 : size_of_item(key, old_value->string());
   size_t new_item_size = size_of_item(key, value);
   size_t new_bytes_used = bytes_used_ - old_item_size + new_item_size;
 
   // Only check quota if the size is increasing, this allows
   // shrinking changes to pre-existing files that are over budget.
   if (new_item_size > old_item_size && new_bytes_used > quota_)
     return false;
 
-  values_[key] = NullableString16(value, false);
+  values_[key] = base::NullableString16(value, false);
   ResetKeyIterator();
   bytes_used_ = new_bytes_used;
   return true;
 }
 
 bool DomStorageMap::RemoveItem(
     const base::string16& key,
     base::string16* old_value) {
   ValuesMap::iterator found = values_.find(key);
   if (found == values_.end())
@@ skipping 19 matching lines @@
   copy->ResetKeyIterator();
   return copy;
 }
 
 void DomStorageMap::ResetKeyIterator() {
   key_iterator_ = values_.begin();
   last_key_index_ = 0;
 }
 
 }  // namespace dom_storage