Relands fixes for 106432, 107287 and 107401. These got reverted

ui/aura_shell/test/test_shell_delegate.cc

Index: ui/aura_shell/test/test_shell_delegate.cc
diff --git a/ui/aura_shell/test/test_shell_delegate.cc b/ui/aura_shell/test/test_shell_delegate.cc
index 42414b7d15758bb171b67ffac2544e5cc606781d..98057f9230d998f8ca72425ea4569351d837ba22 100644
--- a/ui/aura_shell/test/test_shell_delegate.cc
+++ b/ui/aura_shell/test/test_shell_delegate.cc
@@ -4,6 +4,8 @@
 
 #include "ui/aura_shell/test/test_shell_delegate.h"
 
+#include "grit/ui_resources.h"
+
 namespace aura_shell {
 namespace test {
 
@@ -32,5 +34,9 @@ bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) {
   return true;
 }
 
+int TestShellDelegate::GetResourceIDForNewBrowserWindow() {
+  return IDR_AURA_LAUNCHER_ICON_CHROME;
+}
+
 }  // namespace test
 }  // namespace aura_shell