This adds a webui overlay on the extensions page for showing what Extension keybindings are active.…

chrome/common/extensions/extension_commands_unittest.cc

Index: chrome/common/extensions/extension_commands_unittest.cc
===================================================================
--- chrome/common/extensions/extension_commands_unittest.cc	(revision 137495)
+++ chrome/common/extensions/extension_commands_unittest.cc	(working copy)
@@ -6,6 +6,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
+#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -88,7 +90,8 @@
 
     EXPECT_EQ(kTests[i].expected_result, result);
     if (result) {
-      EXPECT_STREQ(kTests[i].description, command.description().c_str());
+      EXPECT_STREQ(kTests[i].description,
+                   UTF16ToASCII(command.description()).c_str());
       EXPECT_STREQ(kTests[i].command_name, command.command_name().c_str());
       EXPECT_EQ(kTests[i].accelerator, command.accelerator());
     }
@@ -106,7 +109,8 @@
 
     EXPECT_EQ(kTests[i].expected_result, result);
     if (result) {
-      EXPECT_STREQ(kTests[i].description, command.description().c_str());
+      EXPECT_STREQ(kTests[i].description,
+                   UTF16ToASCII(command.description()).c_str());
       EXPECT_STREQ(kTests[i].command_name, command.command_name().c_str());
       EXPECT_EQ(kTests[i].accelerator, command.accelerator());
     }
@@ -132,7 +136,8 @@
   extensions::Command command;
   string16 error;
   EXPECT_TRUE(command.Parse(input.get(), command_name, 0, &error));
-  EXPECT_STREQ(description.c_str(), command.description().c_str());
+  EXPECT_STREQ(description.c_str(),
+               UTF16ToASCII(command.description()).c_str());
   EXPECT_STREQ(command_name.c_str(), command.command_name().c_str());
 
 #if defined(OS_WIN)