Move nullable_string16.h to the string subdirectory.

ipc/ipc_message_utils.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 "ipc/ipc_message_utils.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/nullable_string16.h"
+#include "base/strings/nullable_string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "ipc/ipc_channel_handle.h"
 
 #if defined(OS_POSIX)
 #include "ipc/file_descriptor_set_posix.h"
 #elif defined(OS_WIN)
 #include <tchar.h>
@@ skipping 497 matching lines @@
 
   return ReadListValue(m, iter, r, 0);
 }
 
 void ParamTraits<ListValue>::Log(const param_type& p, std::string* l) {
   std::string json;
   base::JSONWriter::Write(&p, &json);
   l->append(json);
 }
 
-void ParamTraits<NullableString16>::Write(Message* m, const param_type& p) {
+void ParamTraits<base::NullableString16>::Write(Message* m,
+                                                const param_type& p) {
   WriteParam(m, p.string());
   WriteParam(m, p.is_null());
 }
 
-bool ParamTraits<NullableString16>::Read(const Message* m, PickleIterator* iter,
-                                         param_type* r) {
+bool ParamTraits<base::NullableString16>::Read(const Message* m,
+                                               PickleIterator* iter,
+                                               param_type* r) {
   string16 string;
   if (!ReadParam(m, iter, &string))
     return false;
   bool is_null;
   if (!ReadParam(m, iter, &is_null))
     return false;
-  *r = NullableString16(string, is_null);
+  *r = base::NullableString16(string, is_null);
   return true;
 }
 
-void ParamTraits<NullableString16>::Log(const param_type& p, std::string* l) {
+void ParamTraits<base::NullableString16>::Log(const param_type& p,
+                                              std::string* l) {
   l->append("(");
   LogParam(p.string(), l);
   l->append(", ");
   LogParam(p.is_null(), l);
   l->append(")");
 }
 
 void ParamTraits<base::PlatformFileInfo>::Write(Message* m,
                                                 const param_type& p) {
   WriteParam(m, p.size);
@@ skipping 262 matching lines @@
   return result;
 }
 
 void ParamTraits<MSG>::Log(const param_type& p, std::string* l) {
   l->append("<MSG>");
 }
 
 #endif  // OS_WIN
 
 }  // namespace IPC