Move nullable_string16.h to the string subdirectory.

content/browser/dom_storage/dom_storage_message_filter.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 "content/browser/dom_storage/dom_storage_message_filter.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
-#include "base/nullable_string16.h"
+#include "base/strings/nullable_string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/common/dom_storage_messages.h"
 #include "content/public/browser/user_metrics.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/browser/dom_storage/dom_storage_area.h"
 #include "webkit/browser/dom_storage/dom_storage_host.h"
 #include "webkit/browser/dom_storage/dom_storage_task_runner.h"
 
@@ skipping 95 matching lines @@
   Send(new DOMStorageMsg_AsyncOperationComplete(true));
 }
 
 void DOMStorageMessageFilter::OnSetItem(
     int connection_id, const string16& key,
     const string16& value, const GURL& page_url) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(0, connection_dispatching_message_for_);
   base::AutoReset<int> auto_reset(&connection_dispatching_message_for_,
                             connection_id);
-  NullableString16 not_used;
+  base::NullableString16 not_used;
   bool success = host_->SetAreaItem(connection_id, key, value,
                                     page_url, &not_used);
   Send(new DOMStorageMsg_AsyncOperationComplete(success));
 }
 
 void DOMStorageMessageFilter::OnRemoveItem(
     int connection_id, const string16& key,
     const GURL& page_url) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(0, connection_dispatching_message_for_);
@@ skipping 15 matching lines @@
 }
 
 void DOMStorageMessageFilter::OnFlushMessages() {
   // Intentionally empty method body.
 }
 
 void DOMStorageMessageFilter::OnDomStorageItemSet(
     const dom_storage::DomStorageArea* area,
     const string16& key,
     const string16& new_value,
-    const NullableString16& old_value,
+    const base::NullableString16& old_value,
     const GURL& page_url) {
   SendDomStorageEvent(area, page_url,
-                      NullableString16(key, false),
-                      NullableString16(new_value, false),
+                      base::NullableString16(key, false),
+                      base::NullableString16(new_value, false),
                       old_value);
 }
 
 void DOMStorageMessageFilter::OnDomStorageItemRemoved(
     const dom_storage::DomStorageArea* area,
     const string16& key,
     const string16& old_value,
     const GURL& page_url) {
   SendDomStorageEvent(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 DOMStorageMessageFilter::OnDomStorageAreaCleared(
     const dom_storage::DomStorageArea* area,
     const GURL& page_url) {
   SendDomStorageEvent(area, page_url,
-                      NullableString16(true),
-                      NullableString16(true),
-                      NullableString16(true));
+                      base::NullableString16(true),
+                      base::NullableString16(true),
+                      base::NullableString16(true));
 }
 
 void DOMStorageMessageFilter::SendDomStorageEvent(
     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(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Only send mutation events to processes which have the area open.
   bool originated_in_process = connection_dispatching_message_for_ != 0;
   if (originated_in_process ||
       host_->HasAreaOpen(area->namespace_id(), area->origin())) {
     DOMStorageMsg_Event_Params params;
     params.origin = area->origin();
     params.page_url = page_url;
     params.connection_id = connection_dispatching_message_for_;
     params.key = key;
     params.new_value = new_value;
     params.old_value = old_value;
     params.namespace_id = area->namespace_id();
     Send(new DOMStorageMsg_Event(params));
   }
 }
 
 }  // namespace content