Deprecating high-conflict accelerators

ash/test/test_shell_delegate.cc

Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index ee6fd44a06c28c7d52be65d43248b76dd3d5a52e..dbc04f8f9c5dd6b77769578d31a7ec1c4ccc4364 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -26,6 +26,7 @@
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/aura/window.h"
+#include "ui/gfx/image/image.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/tray/system_tray_notifier.h"
@@ -199,6 +200,10 @@ base::string16 TestShellDelegate::GetProductName() const {
   return base::string16();
 }
 
+gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const {
+  return gfx::Image();
+}
+
 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
 #if defined(OS_CHROMEOS)
   Shell* shell = Shell::GetInstance();