Move nullable_string16.h to the string subdirectory.

webkit/support/simple_dom_storage_system.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/support/simple_dom_storage_system.h"
 
 #include "base/auto_reset.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebStorageArea.h"
 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"
@@ skipping 127 matching lines @@
 
 unsigned SimpleDomStorageSystem::AreaImpl::length() {
   if (Host())
     return Host()->GetAreaLength(connection_id_);
   return 0;
 }
 
 WebString SimpleDomStorageSystem::AreaImpl::key(unsigned index) {
   if (Host())
     return Host()->GetAreaKey(connection_id_, index);
-  return NullableString16(true);
+  return base::NullableString16(true);
 }
 
 WebString SimpleDomStorageSystem::AreaImpl::getItem(const WebString& key) {
   if (Host())
     return Host()->GetAreaItem(connection_id_, key);
-  return NullableString16(true);
+  return base::NullableString16(true);
 }
 
 void SimpleDomStorageSystem::AreaImpl::setItem(
     const WebString& key, const WebString& newValue,
     const WebURL& pageUrl, Result& result) {
   result = ResultBlockedByQuota;
   if (!Host())
     return;
 
   base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
-  NullableString16 unused;
+  base::NullableString16 unused;
   if (!Host()->SetAreaItem(connection_id_, key, newValue, pageUrl,
                            &unused))
     return;
 
   result = ResultOK;
 }
 
 void SimpleDomStorageSystem::AreaImpl::removeItem(
     const WebString& key, const WebURL& pageUrl) {
   if (!Host())
@@ skipping 43 matching lines @@
 WebStorageNamespace* SimpleDomStorageSystem::CreateSessionStorageNamespace() {
   int id = context_->AllocateSessionId();
   context_->CreateSessionNamespace(id, std::string());
   return new NamespaceImpl(weak_factory_.GetWeakPtr(), id);
 }
 
 void SimpleDomStorageSystem::OnDomStorageItemSet(
     const dom_storage::DomStorageArea* area,
     const base::string16& key,
     const base::string16& new_value,
-    const NullableString16& old_value,
+    const base::NullableString16& old_value,
     const GURL& page_url) {
   DispatchDomStorageEvent(area, page_url,
-                          NullableString16(key, false),
-                          NullableString16(new_value, false),
+                          base::NullableString16(key, false),
+                          base::NullableString16(new_value, false),
                           old_value);
 }
 
 void SimpleDomStorageSystem::OnDomStorageItemRemoved(
     const dom_storage::DomStorageArea* area,
     const base::string16& key,
     const base::string16& old_value,
     const GURL& page_url) {
   DispatchDomStorageEvent(area, page_url,
-                          NullableString16(key, false),
-                          NullableString16(true),
-                          NullableString16(old_value, false));
+                          base::NullableString16(key, false),
+                          base::NullableString16(true),
+                          base::NullableString16(old_value, false));
 }
 
 void SimpleDomStorageSystem::OnDomStorageAreaCleared(
     const dom_storage::DomStorageArea* area,
     const GURL& page_url) {
   DispatchDomStorageEvent(area, page_url,
-                          NullableString16(true),
-                          NullableString16(true),
-                          NullableString16(true));
+                          base::NullableString16(true),
+                          base::NullableString16(true),
+                          base::NullableString16(true));
 }
 
 void SimpleDomStorageSystem::DispatchDomStorageEvent(
     const dom_storage::DomStorageArea* area,
     const GURL& page_url,
-    const NullableString16& key,
-    const NullableString16& new_value,
-    const NullableString16& old_value) {
+    const base::NullableString16& key,
+    const base::NullableString16& new_value,
+    const base::NullableString16& old_value) {
   DCHECK(area_being_processed_);
   if (area->namespace_id() == dom_storage::kLocalStorageNamespaceId) {
     WebStorageEventDispatcher::dispatchLocalStorageEvent(
         key,
         old_value,
         new_value,
         area->origin(),
         page_url,
         area_being_processed_,
         true  /* originatedInProcess */);
   } else {
     NamespaceImpl session_namespace_for_event_dispatch(
         base::WeakPtr<SimpleDomStorageSystem>(), area->namespace_id());
     WebStorageEventDispatcher::dispatchSessionStorageEvent(
         key,
         old_value,
         new_value,
         area->origin(),
         page_url,
         session_namespace_for_event_dispatch,
         area_being_processed_,
         true  /* originatedInProcess */);
   }
 }