Add a nullable string16 class to base. It combines a string16 + a null param...

chrome/common/render_messages_internal.h

 // Copyright (c) 2009 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.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 // See ipc_message_macros.h for explanation of the macros and passes.
 
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 
 #include "base/clipboard.h"
 #include "base/file_path.h"
+#include "base/nullable_string16.h"
 #include "base/platform_file.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
 #include "base/values.h"
 #include "chrome/common/css_colors.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/common/view_types.h"
 #include "ipc/ipc_channel_handle.h"
@@ skipping 1564 matching lines @@
   // explicitly drop the lock via navigator.releaseLock().
   IPC_MESSAGE_CONTROL1(ViewHostMsg_DOMStorageUnlock,
                        int64 /* storage_area_id */)
 
   // Get the length of a storage area.
   IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_DOMStorageLength,
                               int64 /* storage_area_id */,
                               unsigned /* length */)
 
   // Get a the ith key within a storage area.
-  IPC_SYNC_MESSAGE_CONTROL2_2(ViewHostMsg_DOMStorageKey,
+  IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_DOMStorageKey,
                               int64 /* storage_area_id */,
                               unsigned /* index */,
-                              string16 /* key */,
-                              bool /* key_is_null */)
+                              NullableString16 /* key */)
 
   // Get a value based on a key from a storage area.
-  // TODO(jorlow): Convert value + value_is_null over to a NullableString16
-  //               once http://crbug.com/17343 is completed.
-  IPC_SYNC_MESSAGE_CONTROL2_2(ViewHostMsg_DOMStorageGetItem,
+  IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_DOMStorageGetItem,
                               int64 /* storage_area_id */,
                               string16 /* key */,
-                              string16 /* value */,
-                              bool /* value_is_null */)
+                              NullableString16 /* value */)
 
   // Set a value that's associated with a key in a storage area.
   IPC_MESSAGE_CONTROL3(ViewHostMsg_DOMStorageSetItem,
                        int64 /* storage_area_id */,
                        string16 /* key */,
                        string16 /* value */)
 
   // Remove the value associated with a key in a storage area.
   IPC_MESSAGE_CONTROL2(ViewHostMsg_DOMStorageRemoveItem,
                        int64 /* storage_area_id */,
@@ skipping 66 matching lines @@
   IPC_MESSAGE_CONTROL2(ViewHostMsg_DatabaseGetFileAttributes,
                        FilePath /* the name of the file */,
                        int32 /* a unique message ID */)
 
   // Asks the browser process to return the size of a DB file
   IPC_MESSAGE_CONTROL2(ViewHostMsg_DatabaseGetFileSize,
                        FilePath /* the name of the file */,
                        int32 /* a unique message ID */)
 
 IPC_END_MESSAGES(ViewHost)