Move nullable_string16.h to the string subdirectory.

webkit/browser/dom_storage/dom_storage_area.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/browser/dom_storage/dom_storage_area.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 95 matching lines @@
   map_->ExtractValues(map);
 }
 
 unsigned DomStorageArea::Length() {
   if (is_shutdown_)
     return 0;
   InitialImportIfNeeded();
   return map_->Length();
 }
 
-NullableString16 DomStorageArea::Key(unsigned index) {
+base::NullableString16 DomStorageArea::Key(unsigned index) {
   if (is_shutdown_)
-    return NullableString16(true);
+    return base::NullableString16(true);
   InitialImportIfNeeded();
   return map_->Key(index);
 }
 
-NullableString16 DomStorageArea::GetItem(const base::string16& key) {
+base::NullableString16 DomStorageArea::GetItem(const base::string16& key) {
   if (is_shutdown_)
-    return NullableString16(true);
+    return base::NullableString16(true);
   InitialImportIfNeeded();
   return map_->GetItem(key);
 }
 
 bool DomStorageArea::SetItem(const base::string16& key,
                              const base::string16& value,
-                             NullableString16* old_value) {
+                             base::NullableString16* old_value) {
   if (is_shutdown_)
     return false;
   InitialImportIfNeeded();
   if (!map_->HasOneRef())
     map_ = map_->DeepCopy();
   bool success = map_->SetItem(key, value, old_value);
   if (success && backing_) {
     CommitBatch* commit_batch = CreateCommitBatchIfNeeded();
-    commit_batch->changed_values[key] = NullableString16(value, false);
+    commit_batch->changed_values[key] = base::NullableString16(value, false);
   }
   return success;
 }
 
 bool DomStorageArea::RemoveItem(const base::string16& key,
                                 base::string16* old_value) {
   if (is_shutdown_)
     return false;
   InitialImportIfNeeded();
   if (!map_->HasOneRef())
     map_ = map_->DeepCopy();
   bool success = map_->RemoveItem(key, old_value);
   if (success && backing_) {
     CommitBatch* commit_batch = CreateCommitBatchIfNeeded();
-    commit_batch->changed_values[key] = NullableString16(true);
+    commit_batch->changed_values[key] = base::NullableString16(true);
   }
   return success;
 }
 
 bool DomStorageArea::Clear() {
   if (is_shutdown_)
     return false;
   InitialImportIfNeeded();
   if (map_->Length() == 0)
     return false;
@@ skipping 222 matching lines @@
         commit_batch_->clear_all_first,
         commit_batch_->changed_values);
     DCHECK(success);
   }
   commit_batch_.reset();
   backing_.reset();
   session_storage_backing_ = NULL;
 }
 
 }  // namespace dom_storage