Double dollar ($$) parsing in messages.json broken

chrome/renderer/extensions/i18n_custom_bindings.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 "chrome/renderer/extensions/i18n_custom_bindings.h"
 
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/renderer_resources.h"
@@ skipping 42 matching lines @@
     l10n_messages_map[extension_id] = messages;
 
     l10n_messages = GetL10nMessagesMap(extension_id);
   }
 
   std::string message_name = *v8::String::AsciiValue(args[0]);
   std::string message =
       ExtensionMessageBundle::GetL10nMessage(message_name, *l10n_messages);
 
   std::vector<std::string> substitutions;
-  if (args[1]->IsNull() || args[1]->IsUndefined()) {
-    // chrome.i18n.getMessage("message_name");
-    // chrome.i18n.getMessage("message_name", null);
-    return v8::String::New(message.c_str());
-  } else if (args[1]->IsArray()) {
+  if (args[1]->IsArray()) {
     // chrome.i18n.getMessage("message_name", ["more", "params"]);
     v8::Local<v8::Array> placeholders = v8::Local<v8::Array>::Cast(args[1]);
     uint32_t count = placeholders->Length();
     if (count > 9)
       return v8::Undefined();
     for (uint32_t i = 0; i < count; ++i) {
       substitutions.push_back(
           *v8::String::Utf8Value(
               placeholders->Get(v8::Integer::New(i))->ToString()));
     }
-  } else {
+  } else if (args[1]->IsString()) {
     // chrome.i18n.getMessage("message_name", "one param");
     substitutions.push_back(*v8::String::Utf8Value(args[1]->ToString()));
   }
 
   return v8::String::New(ReplaceStringPlaceholders(
       message, substitutions, NULL).c_str());
 }
 
 }  // namespace extension