Move nullable_string16.h to the string subdirectory.

webkit/browser/dom_storage/dom_storage_host.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_host.h"
 
 #include "googleurl/src/gurl.h"
 #include "webkit/browser/dom_storage/dom_storage_area.h"
 #include "webkit/browser/dom_storage/dom_storage_context.h"
 #include "webkit/browser/dom_storage/dom_storage_namespace.h"
@@ skipping 62 matching lines @@
   return true;
 }
 
 unsigned DomStorageHost::GetAreaLength(int connection_id) {
   DomStorageArea* area = GetOpenArea(connection_id);
   if (!area)
     return 0;
   return area->Length();
 }
 
-NullableString16 DomStorageHost::GetAreaKey(int connection_id, unsigned index) {
+base::NullableString16 DomStorageHost::GetAreaKey(int connection_id,
+                                                  unsigned index) {
   DomStorageArea* area = GetOpenArea(connection_id);
   if (!area)
-    return NullableString16(true);
+    return base::NullableString16(true);
   return area->Key(index);
 }
 
-NullableString16 DomStorageHost::GetAreaItem(int connection_id,
-                                             const base::string16& key) {
+base::NullableString16 DomStorageHost::GetAreaItem(int connection_id,
+                                                   const base::string16& key) {
   DomStorageArea* area = GetOpenArea(connection_id);
   if (!area)
-    return NullableString16(true);
+    return base::NullableString16(true);
   return area->GetItem(key);
 }
 
 bool DomStorageHost::SetAreaItem(
     int connection_id, const base::string16& key,
     const base::string16& value, const GURL& page_url,
-    NullableString16* old_value) {
+    base::NullableString16* old_value) {
   DomStorageArea* area = GetOpenArea(connection_id);
   if (!area) {
     // TODO(michaeln): Fix crbug/134003 and return false here.
     // Until then return true to allow the renderer to operate
     // to a limited degree out of its cache.
     return true;
   }
   if (!area->SetItem(key, value, old_value))
     return false;
   if (old_value->is_null() || old_value->string() != value)
@@ skipping 48 matching lines @@
     return NULL;
   return found->second.namespace_.get();
 }
 
 // NamespaceAndArea
 
 DomStorageHost::NamespaceAndArea::NamespaceAndArea() {}
 DomStorageHost::NamespaceAndArea::~NamespaceAndArea() {}
 
 }  // namespace dom_storage