Move nullable_string16.h to the string subdirectory.

webkit/browser/dom_storage/dom_storage_context.h

Index: webkit/browser/dom_storage/dom_storage_context.h
diff --git a/webkit/browser/dom_storage/dom_storage_context.h b/webkit/browser/dom_storage/dom_storage_context.h
index 424f273d6b798502a8d780f6df7023e9a91f115f..62bc3aedcff51d7cf2e8c2d05beb440f1121fa34 100644
--- a/webkit/browser/dom_storage/dom_storage_context.h
+++ b/webkit/browser/dom_storage/dom_storage_context.h
@@ -19,10 +19,9 @@
 #include "googleurl/src/gurl.h"
 #include "webkit/storage/webkit_storage_export.h"
 
-class NullableString16;
-
 namespace base {
 class FilePath;
+class NullableString16;
 class Time;
 }
 
@@ -70,7 +69,7 @@ class WEBKIT_STORAGE_EXPORT DomStorageContext
         const DomStorageArea* area,
         const base::string16& key,
         const base::string16& new_value,
-        const NullableString16& old_value,  // may be null on initial insert
+        const base::NullableString16& old_value,  // may be null on initial insert
         const GURL& page_url) = 0;
     virtual void OnDomStorageItemRemoved(
         const DomStorageArea* area,
@@ -93,7 +92,9 @@ class WEBKIT_STORAGE_EXPORT DomStorageContext
 
   // Returns the directory path for localStorage, or an empty directory, if
   // there is no backing on disk.
-  const base::FilePath& localstorage_directory() { return localstorage_directory_; }
+  const base::FilePath& localstorage_directory() {
+    return localstorage_directory_;
+  }
 
   // Returns the directory path for sessionStorage, or an empty directory, if
   // there is no backing on disk.
@@ -133,7 +134,7 @@ class WEBKIT_STORAGE_EXPORT DomStorageContext
       const DomStorageArea* area,
       const base::string16& key,
       const base::string16& new_value,
-      const NullableString16& old_value,
+      const base::NullableString16& old_value,
       const GURL& page_url);
   void NotifyItemRemoved(
       const DomStorageArea* area,