Mac: Some clang appeasing.

webkit/glue/glue_serialize.cc

 // Copyright (c) 2010 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 "webkit/glue/glue_serialize.h"
 
 #include <string>
 
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
@@ skipping 173 matching lines @@
   // Versions 1, 2, and 3 all start with an integer.
   if (!obj->pickle.ReadInt(&obj->iter, &length))
     return WebString();
 
   // Starting with version 2, -1 means WebString().
   if (length == -1)
     return WebString();
 
   // In version 2, the length field was the length in WebUChars.
   // In version 1 and 3 it is the length in bytes.
-  int bytes = ((obj->version == 2) ? length * sizeof(WebUChar) : length);
+  int bytes = length;
+  if (obj->version == 2)
+    bytes *= sizeof(WebUChar);
 
   const void* data;
   if (!ReadBytes(obj, &data, bytes))
     return WebString();
   return WebString(static_cast<const WebUChar*>(data),
                    bytes / sizeof(WebUChar));
 }
 
 // Writes a Vector of Strings into a SerializeObject for serialization.
 static void WriteStringVector(
@@ skipping 259 matching lines @@
   const WebHistoryItem& item = HistoryItemFromString(content_state, false);
   if (item.isNull()) {
     // Couldn't parse the string, return an empty string.
     return std::string();
   }
 
   return HistoryItemToString(item);
 }
 
 }  // namespace webkit_glue