Move nullable_string16.h to the string subdirectory.

webkit/browser/dom_storage/dom_storage_context.h

 // 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.
 
 #ifndef WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
 #define WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/storage/webkit_storage_export.h"
 
-class NullableString16;
-
 namespace base {
 class FilePath;
+class NullableString16;
 class Time;
 }
 
 namespace quota {
 class SpecialStoragePolicy;
 }
 
 namespace dom_storage {
 
 class DomStorageArea;
@@ skipping 27 matching lines @@
     : public base::RefCountedThreadSafe<DomStorageContext> {
  public:
   // An interface for observing Local and Session Storage events on the
   // background thread.
   class EventObserver {
    public:
     virtual void OnDomStorageItemSet(
         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,
         const base::string16& key,
         const base::string16& old_value,
         const GURL& page_url) = 0;
     virtual void OnDomStorageAreaCleared(
         const DomStorageArea* area,
         const GURL& page_url) = 0;
 
    protected:
     virtual ~EventObserver() {}
   };
 
   DomStorageContext(
       const base::FilePath& localstorage_directory,  // empty for incognito profiles
       const base::FilePath& sessionstorage_directory,  // empty for incognito profiles
       quota::SpecialStoragePolicy* special_storage_policy,
       DomStorageTaskRunner* task_runner);
 
   // 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.
   const base::FilePath& sessionstorage_directory() {
     return sessionstorage_directory_;
   }
 
   DomStorageTaskRunner* task_runner() const { return task_runner_.get(); }
   DomStorageNamespace* GetStorageNamespace(int64 namespace_id);
 
@@ skipping 19 matching lines @@
   // this method has been called.
   void Shutdown();
 
   // Methods to add, remove, and notify EventObservers.
   void AddEventObserver(EventObserver* observer);
   void RemoveEventObserver(EventObserver* observer);
   void NotifyItemSet(
       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,
       const base::string16& key,
       const base::string16& old_value,
       const GURL& page_url);
   void NotifyAreaCleared(
       const DomStorageArea* area,
       const GURL& page_url);
 
@@ skipping 74 matching lines @@
   std::set<std::string> protected_persistent_session_ids_;
 
   // Mapping between persistent namespace IDs and namespace IDs for
   // sessionStorage.
   std::map<std::string, int64> persistent_namespace_id_to_namespace_id_;
 };
 
 }  // namespace dom_storage
 
 #endif  // WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_