Extract content dependency from keyboard code

ui/keyboard/keyboard_util.cc

Index: ui/keyboard/keyboard_util.cc
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index ecc8e29c52f05036d197dbebf22f2ea59b651f55..2a5ae6a8d51db929780c7d1261b2725e55d9c54b 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -12,8 +12,6 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
-#include "grit/keyboard_resources.h"
-#include "grit/keyboard_resources_map.h"
 #include "media/audio/audio_manager.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window_tree_host.h"
@@ -26,9 +24,8 @@
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/keyboard/keyboard_controller.h"
-#include "ui/keyboard/keyboard_controller_proxy.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "url/gurl.h"
+#include "ui/keyboard/keyboard_ui.h"
 
 namespace {
 
@@ -52,8 +49,6 @@ bool g_accessibility_keyboard_enabled = false;
 
 bool g_hotrod_keyboard_enabled = false;
 
-base::LazyInstance<GURL> g_override_content_url = LAZY_INSTANCE_INITIALIZER;
-
 bool g_touch_keyboard_enabled = false;
 
 keyboard::KeyboardState g_requested_keyboard_state =
@@ -223,7 +218,7 @@ bool InsertText(const base::string16& text) {
   if (!controller)
     return false;
 
-  ui::InputMethod* input_method = controller->proxy()->GetInputMethod();
+  ui::InputMethod* input_method = controller->ui()->GetInputMethod();
   if (!input_method)
     return false;
 
@@ -390,96 +385,6 @@ void MarkKeyboardLoadFinished() {
   }
 }
 
-const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
-  // This looks a lot like the contents of a resource map; however it is
-  // necessary to have a custom path for the extension path, so the resource
-  // map cannot be used directly.
-  static const GritResourceMap kKeyboardResources[] = {
-      {"keyboard/locales/en.js", IDR_KEYBOARD_LOCALES_EN},
-      {"keyboard/config/emoji.js", IDR_KEYBOARD_CONFIG_EMOJI},
-      {"keyboard/config/hwt.js", IDR_KEYBOARD_CONFIG_HWT},
-      {"keyboard/config/us.js", IDR_KEYBOARD_CONFIG_US},
-      {"keyboard/emoji.css", IDR_KEYBOARD_CSS_EMOJI},
-      {"keyboard/images/3dots.png", IDR_KEYBOARD_IMAGES_3_DOTS},
-      {"keyboard/images/back_to_keyboard.png",
-       IDR_KEYBOARD_IMAGES_BACK_TO_KEYBOARD},
-      {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
-      {"keyboard/images/car.png", IDR_KEYBOARD_IMAGES_CAR},
-      {"keyboard/images/check.png", IDR_KEYBOARD_IMAGES_CHECK},
-      {"keyboard/images/check_in_menu.png", IDR_KEYBOARD_IMAGES_CHECK_IN_MENU},
-      {"keyboard/images/compact.png", IDR_KEYBOARD_IMAGES_COMPACT},
-      {"keyboard/images/down.png", IDR_KEYBOARD_IMAGES_DOWN},
-      {"keyboard/images/emoji.png", IDR_KEYBOARD_IMAGES_EMOJI},
-      {"keyboard/images/emoji_car.png", IDR_KEYBOARD_IMAGES_EMOJI_CAR},
-      {"keyboard/images/emoji_crown.png", IDR_KEYBOARD_IMAGES_EMOJI_CROWN},
-      {"keyboard/images/emoji_emoticon.png",
-       IDR_KEYBOARD_IMAGES_EMOJI_EMOTICON},
-      {"keyboard/images/emoji_flower.png", IDR_KEYBOARD_IMAGES_EMOJI_FLOWER},
-      {"keyboard/images/emoji_hot.png", IDR_KEYBOARD_IMAGES_EMOJI_HOT},
-      {"keyboard/images/emoji_recent.png", IDR_KEYBOARD_IMAGES_EMOJI_RECENT},
-      {"keyboard/images/emoji_shape.png", IDR_KEYBOARD_IMAGES_EMOJI_SHAPE},
-      {"keyboard/images/emoji_cat_items.png", IDR_KEYBOARD_IMAGES_CAT},
-      {"keyboard/images/emoticon.png", IDR_KEYBOARD_IMAGES_EMOTICON},
-      {"keyboard/images/enter.png", IDR_KEYBOARD_IMAGES_RETURN},
-      {"keyboard/images/error.png", IDR_KEYBOARD_IMAGES_ERROR},
-      {"keyboard/images/favorit.png", IDR_KEYBOARD_IMAGES_FAVORITE},
-      {"keyboard/images/flower.png", IDR_KEYBOARD_IMAGES_FLOWER},
-      {"keyboard/images/globe.png", IDR_KEYBOARD_IMAGES_GLOBE},
-      {"keyboard/images/hide.png", IDR_KEYBOARD_IMAGES_HIDE},
-      {"keyboard/images/hidekeyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
-      {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
-      {"keyboard/images/left.png", IDR_KEYBOARD_IMAGES_LEFT},
-      {"keyboard/images/penci.png", IDR_KEYBOARD_IMAGES_PENCIL},
-      {"keyboard/images/recent.png", IDR_KEYBOARD_IMAGES_RECENT},
-      {"keyboard/images/regular_size.png", IDR_KEYBOARD_IMAGES_FULLSIZE},
-      {"keyboard/images/menu.png", IDR_KEYBOARD_IMAGES_MENU},
-      {"keyboard/images/pencil.png", IDR_KEYBOARD_IMAGES_PENCIL},
-      {"keyboard/images/right.png", IDR_KEYBOARD_IMAGES_RIGHT},
-      {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH},
-      {"keyboard/images/select_right.png", IDR_KEYBOARD_IMAGES_SELECT_RIGHT},
-      {"keyboard/images/select_left.png", IDR_KEYBOARD_IMAGES_SELECT_LEFT},
-      {"keyboard/images/setting.png", IDR_KEYBOARD_IMAGES_SETTINGS},
-      {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT},
-      {"keyboard/images/space.png", IDR_KEYBOARD_IMAGES_SPACE},
-      {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
-      {"keyboard/images/tab_in_fullsize.png",
-       IDR_KEYBOARD_IMAGES_TAB_IN_FULLSIZE},
-      {"keyboard/images/triangle.png", IDR_KEYBOARD_IMAGES_TRIANGLE},
-      {"keyboard/images/up.png", IDR_KEYBOARD_IMAGES_UP},
-      {"keyboard/index.html", IDR_KEYBOARD_INDEX},
-      {"keyboard/inputview_adapter.js", IDR_KEYBOARD_INPUTVIEW_ADAPTER},
-      {"keyboard/inputview.css", IDR_KEYBOARD_INPUTVIEW_CSS},
-      {"keyboard/inputview.js", IDR_KEYBOARD_INPUTVIEW_JS},
-      {"keyboard/inputview_layouts/101kbd.js", IDR_KEYBOARD_LAYOUTS_101},
-      {"keyboard/inputview_layouts/compactkbd-qwerty.js",
-       IDR_KEYBOARD_LAYOUTS_COMPACT_QWERTY},
-      {"keyboard/inputview_layouts/compactkbd-numberpad.js",
-       IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD},
-      {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI},
-      {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT},
-      {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
-      {"keyboard/sounds/keypress-delete.wav",
-       IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
-      {"keyboard/sounds/keypress-return.wav",
-       IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN},
-      {"keyboard/sounds/keypress-spacebar.wav",
-       IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
-      {"keyboard/sounds/keypress-standard.wav",
-       IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
-  };
-  static const size_t kKeyboardResourcesSize = arraysize(kKeyboardResources);
-  *size = kKeyboardResourcesSize;
-  return kKeyboardResources;
-}
-
-void SetOverrideContentUrl(const GURL& url) {
-  g_override_content_url.Get() = url;
-}
-
-const GURL& GetOverrideContentUrl() {
-  return g_override_content_url.Get();
-}
-
 void LogKeyboardControlEvent(KeyboardControlEvent event) {
   UMA_HISTOGRAM_ENUMERATION(
       "VirtualKeyboard.KeyboardControlEvent",