Move nullable_string16.h to the string subdirectory.

BUG=247723
TEST=no change
TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/16415016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206066 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 10 deletions

diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 0cdc2b4ef..839f15b 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -7,7 +7,7 @@
 #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"
@@ -525,24 +525,27 @@ void ParamTraits<ListValue>::Log(const param_type& p, std::string* l) {
   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(", ");
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index ac324e0..7fda943 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -45,12 +45,11 @@
 #error "Please add the noinline property for your new compiler here."
 #endif
 
-class NullableString16;
-
 namespace base {
 class DictionaryValue;
 class FilePath;
 class ListValue;
+class NullableString16;
 class Time;
 class TimeDelta;
 class TimeTicks;
@@ -454,8 +453,8 @@ struct IPC_EXPORT ParamTraits<base::ListValue> {
 };
 
 template <>
-struct IPC_EXPORT ParamTraits<NullableString16> {
-  typedef NullableString16 param_type;
+struct IPC_EXPORT ParamTraits<base::NullableString16> {
+  typedef base::NullableString16 param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, PickleIterator* iter,
                    param_type* r);