Move web_ui_util.* from chrome\browser\ui\webui to ui\webui so that they can be used by webui pages outside of chrome.

BUG=169170
Review URL: https://codereview.chromium.org/12052034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178253 0039d316-1c4b-4281-b951-d872f2087c98

43 files changed, 89 insertions, 351 deletions

diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.cc b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
index d8a7f3b..0f70b2d 100644
--- a/chrome/browser/chromeos/extensions/file_browser_notifications.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
@@ -14,11 +14,11 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 66d8329..25ecffe 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -56,7 +56,6 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ -84,6 +83,7 @@
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/glue/web_intent_service_data.h"
+#include "ui/webui/web_ui_util.h"
 
 using extensions::app_file_handler_util::FindFileHandlersForMimeTypes;
 using chromeos::disks::DiskMountManager;
@@ -2211,7 +2211,7 @@ bool FileDialogStringsFunction::RunImpl() {
   dict->SetBoolean("PDF_VIEW_ENABLED",
       file_manager_util::ShouldBeOpenedWithPdfPlugin(profile(), ".pdf"));
 
-  web_ui_util::SetFontAndTextDirection(dict);
+  webui::SetFontAndTextDirection(dict);
 
   drive::DriveSystemService* system_service =
       drive::DriveSystemServiceFactory::GetForProfile(profile_);
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index 9c71d78..1efbdb1 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -24,7 +24,6 @@
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/image_decoder.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_fetcher.h"
@@ -36,6 +35,7 @@
 #include "grit/platform_locale_settings.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/webui/web_ui_util.h"
 
 using base::BinaryValue;
 using content::BrowserThread;
@@ -208,7 +208,7 @@ bool WallpaperStringsFunction::RunImpl() {
   SET_STRING("learnMore", IDS_LEARN_MORE);
 #undef SET_STRING
 
-  web_ui_util::SetFontAndTextDirection(dict);
+  webui::SetFontAndTextDirection(dict);
 
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc
index 0bd9eb1..bba541b 100644
--- a/chrome/browser/chromeos/login/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
 
+#include "base/debug/trace_event.h"
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -23,15 +24,13 @@
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 #include "ui/gfx/image/image_skia.h"
-
-#include "base/debug/trace_event.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 
@@ -539,7 +538,7 @@ void UserImageManagerImpl::InitDownloadedProfileImage() {
     VLOG(1) << "Profile image initialized";
     downloaded_profile_image_ = logged_in_user->image();
     downloaded_profile_image_data_url_ =
-        web_ui_util::GetBitmapDataUrl(*downloaded_profile_image_.bitmap());
+        webui::GetBitmapDataUrl(*downloaded_profile_image_.bitmap());
     profile_image_url_ = logged_in_user->image_url();
   }
 }
@@ -651,7 +650,7 @@ void UserImageManagerImpl::OnProfileDownloadSuccess(
 
   // Check if this image is not the same as already downloaded.
   SkBitmap new_bitmap(downloader->GetProfilePicture());
-  std::string new_image_data_url = web_ui_util::GetBitmapDataUrl(new_bitmap);
+  std::string new_image_data_url = webui::GetBitmapDataUrl(new_bitmap);
   if (!downloaded_profile_image_data_url_.empty() &&
       new_image_data_url == downloaded_profile_image_data_url_)
     return;
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
index bf7ce38..0265b19 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -22,7 +22,6 @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_view_host.h"
@@ -30,6 +29,7 @@
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/webui/web_ui_util.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
@@ -378,7 +378,7 @@ bool BookmarkManagerGetStringsFunction::RunImpl() {
   localized_strings->SetString("cancel",
       l10n_util::GetStringUTF16(IDS_CANCEL));
 
-  web_ui_util::SetFontAndTextDirection(localized_strings);
+  webui::SetFontAndTextDirection(localized_strings);
 
   SetResult(localized_strings);
 
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index dc838a3..c29ee933 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -39,7 +39,6 @@
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/downloads.h"
@@ -57,6 +56,7 @@
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
@@ -275,7 +275,7 @@ void DownloadFileIconExtractorImpl::OnIconLoadComplete(gfx::Image* icon) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   std::string url;
   if (icon)
-    url = web_ui_util::GetBitmapDataUrl(icon->AsBitmap());
+    url = webui::GetBitmapDataUrl(icon->AsBitmap());
   callback_.Run(url);
 }
 
diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.cc b/chrome/browser/managed_mode/managed_mode_interstitial.cc
index a52ac66..4850f54 100644
--- a/chrome/browser/managed_mode/managed_mode_interstitial.cc
+++ b/chrome/browser/managed_mode/managed_mode_interstitial.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ -22,6 +21,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 
@@ -105,7 +105,7 @@ std::string ManagedModeInterstitial::GetHTMLContents() {
   strings.SetString(
       "contentPacksSectionButton",
       l10n_util::GetStringUTF16(IDS_CONTENT_PACKS_SECTION_BUTTON));
-  web_ui_util::SetFontAndTextDirection(&strings);
+  webui::SetFontAndTextDirection(&strings);
 
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index 6b4ee0f..3858902 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -23,7 +23,6 @@
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
@@ -43,6 +42,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 using content::RenderViewHost;
@@ -288,7 +288,7 @@ std::string DesktopNotificationService::AddIconNotification(
 #else
   GURL icon_url;
   if (!icon.isNull())
-    icon_url = GURL(web_ui_util::GetBitmapDataUrl(*icon.bitmap()));
+    icon_url = GURL(webui::GetBitmapDataUrl(*icon.bitmap()));
   return AddNotification(
       origin_url, title, message, icon_url, replace_id, delegate, profile);
 #endif
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
index b286aa5..7bb6d73 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
@@ -9,7 +9,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
@@ -20,6 +19,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 // Define the values of standard URLs.
 const char CloudPrintSetupSource::kInvalidPasswordHelpUrl[] =
@@ -74,7 +74,7 @@ void CloudPrintSetupSource::StartDataRequest(
 
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML));
-    web_ui_util::SetFontAndTextDirection(dict);
+    webui::SetFontAndTextDirection(dict);
     response = webui::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintGaiaLoginPath) {
     // Start by setting the per-locale URLs we show on the setup wizard.
@@ -110,7 +110,7 @@ void CloudPrintSetupSource::StartDataRequest(
 
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_GAIA_LOGIN_HTML));
-    web_ui_util::SetFontAndTextDirection(dict);
+    webui::SetFontAndTextDirection(dict);
     response = webui::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintSetupDonePath) {
     AddString(dict, "testpage", IDS_CLOUD_PRINT_SETUP_TEST_PAGE);
@@ -118,7 +118,7 @@ void CloudPrintSetupSource::StartDataRequest(
     AddString(dict, "okay", IDS_SYNC_SETUP_OK_BUTTON_LABEL);
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML));
-    web_ui_util::SetFontAndTextDirection(dict);
+    webui::SetFontAndTextDirection(dict);
     response = webui::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintSetupFlowPath) {
     static const base::StringPiece html(
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 245268f..02f6272 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ -43,6 +42,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 using content::InterstitialPage;
@@ -947,7 +947,7 @@ void SafeBrowsingBlockingPageV2::PopulateStringDictionary(
   strings->SetString("proceed",
       l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_MALWARE_V2_PROCEED_LINK));
 
-  web_ui_util::SetFontAndTextDirection(strings);
+  webui::SetFontAndTextDirection(strings);
 }
 
 void SafeBrowsingBlockingPageV2::PopulateMultipleThreatStringDictionary(
diff --git a/chrome/browser/status_icons/desktop_notification_balloon.cc b/chrome/browser/status_icons/desktop_notification_balloon.cc
index 0b1501b..0bcd285 100644
--- a/chrome/browser/status_icons/desktop_notification_balloon.cc
+++ b/chrome/browser/status_icons/desktop_notification_balloon.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 6113d29..8234cea 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -37,7 +37,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ -58,6 +57,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_source.h"
@@ -937,7 +937,7 @@ void AboutMemoryHandler::OnDetailsAvailable() {
   load_time_data.SetString(
       "summary_desc",
       l10n_util::GetStringUTF16(IDS_MEMORY_USAGE_SUMMARY_DESC));
-  web_ui_util::SetFontAndTextDirection(&load_time_data);
+  webui::SetFontAndTextDirection(&load_time_data);
   load_time_data.Set("jstemplateData", root.release());
 
   webui::UseVersion2 version2;
diff --git a/chrome/browser/ui/webui/chrome_web_ui_data_source.cc b/chrome/browser/ui/webui/chrome_web_ui_data_source.cc
index cb1ba69..3c8220a 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_data_source.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_data_source.cc
@@ -9,10 +9,10 @@
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_util.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 // Internal class to hide the fact that ChromeWebUIDataSource implements
 // content::URLDataSource.
@@ -189,7 +189,7 @@ void ChromeWebUIDataSource::StartDataRequest(
 void ChromeWebUIDataSource::SendLocalizedStringsAsJSON(
     const content::URLDataSource::GotDataCallback& callback) {
   std::string template_data;
-  web_ui_util::SetFontAndTextDirection(&localized_strings_);
+  webui::SetFontAndTextDirection(&localized_strings_);
 
   scoped_ptr<webui::UseVersion2> version2;
   if (json_js_format_v2_)
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index 58fe399..c3ddec9 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -11,12 +11,12 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
@@ -89,7 +89,7 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
     if (model->GetIconAt(i, &icon)) {
       SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
           web_ui_->GetDeviceScaleFactor()).sk_bitmap();
-      item->SetString("icon", web_ui_util::GetBitmapDataUrl(icon_bitmap));
+      item->SetString("icon", webui::GetBitmapDataUrl(icon_bitmap));
     }
     if (id >= 0) {
       item->SetBoolean("enabled", model->IsEnabledAt(i));
@@ -166,7 +166,7 @@ void NetworkDropdown::SetNetworkIconAndText() {
       web_ui_->GetDeviceScaleFactor()).sk_bitmap();
   std::string icon_str =
       icon_image.isNull() ?
-          std::string() : web_ui_util::GetBitmapDataUrl(icon_bitmap);
+          std::string() : webui::GetBitmapDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index e8675cd..5fde4bc 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -33,7 +33,6 @@
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/url_data_source.h"
@@ -42,6 +41,7 @@
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::WebContents;
 
@@ -274,7 +274,7 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
   // Note, handlers_[0] is a GenericHandler used by the WebUI.
   for (size_t i = 0; i < handlers_.size(); ++i)
     handlers_[i]->GetLocalizedStrings(localized_strings);
-  web_ui_util::SetFontAndTextDirection(localized_strings);
+  webui::SetFontAndTextDirection(localized_strings);
 
 #if defined(GOOGLE_CHROME_BUILD)
   localized_strings->SetString("buildType", "chrome");
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index ee79174..3cd55fa 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
@@ -23,6 +22,7 @@
 #include "net/base/data_url.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace chromeos {
 
@@ -142,7 +142,7 @@ void UserImageScreenHandler::RegisterMessages() {
 }
 
 void UserImageScreenHandler::AddProfileImage(const gfx::ImageSkia& image) {
-  profile_picture_data_url_ = web_ui_util::GetBitmapDataUrl(*image.bitmap());
+  profile_picture_data_url_ = webui::GetBitmapDataUrl(*image.bitmap());
   SendProfileImage(profile_picture_data_url_);
 }
 
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 4c021aa..989d068 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ -43,6 +42,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using chromeos::CellularNetwork;
 using chromeos::CrosLibrary;
@@ -219,7 +219,7 @@ void MobileSetupUIHTMLSource::StartDataRequest(
                     l10n_util::GetStringUTF16(IDS_CANCEL));
   strings.SetString("ok_button",
                     l10n_util::GetStringUTF16(IDS_OK));
-  web_ui_util::SetFontAndTextDirection(&strings);
+  webui::SetFontAndTextDirection(&strings);
 
   static const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
index 014c0fd..f8f840b 100644
--- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
@@ -22,6 +21,7 @@
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ -67,7 +67,7 @@ void ProxySettingsHTMLSource::StartDataRequest(
     const std::string& path,
     bool is_incognito,
     const content::URLDataSource::GotDataCallback& callback) {
-  web_ui_util::SetFontAndTextDirection(localized_strings_.get());
+  webui::SetFontAndTextDirection(localized_strings_.get());
 
   static const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
index 6197166..43061a9 100644
--- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ -32,6 +31,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 using content::WebContents;
@@ -314,7 +314,7 @@ void SimUnlockUIHTMLSource::StartDataRequest(
   strings.SetString("oldPin", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_CHANGE_PIN_OLD_PIN));
 
-  web_ui_util::SetFontAndTextDirection(&strings);
+  webui::SetFontAndTextDirection(&strings);
 
   static const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
index 9f7efd3..f110d5f 100644
--- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/url_data_source.h"
@@ -37,6 +36,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ -139,7 +139,7 @@ void SystemInfoUIHTMLSource::RequestComplete() {
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND));
   strings.SetString("collapse_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE));
-  web_ui_util::SetFontAndTextDirection(&strings);
+  webui::SetFontAndTextDirection(&strings);
   if (response_.get()) {
     ListValue* details = new ListValue();
     strings.Set("details", details);
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index c71e726..628afc6 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -10,13 +10,13 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "grit/locale_settings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
@@ -121,7 +121,7 @@ void FaviconSource::StartDataRequest(
 
     std::string scale_str = path.substr(scale_delimiter + 1,
                                         slash - scale_delimiter - 1);
-    web_ui_util::ParseScaleFactor(scale_str, &scale_factor);
+    webui::ParseScaleFactor(scale_str, &scale_factor);
 
     if (scale_factor != ui::SCALE_FACTOR_100P && size_in_dip != 16) {
       SendDefaultResponse(callback);
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc
index 50f6f32..07a68a4 100644
--- a/chrome/browser/ui/webui/fileicon_source.cc
+++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -13,7 +13,6 @@
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/time_format.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
@@ -22,6 +21,7 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
@@ -84,7 +84,7 @@ void ParseQueryParams(const std::string& query,
     if (icon_size && iter->first == kIconSize)
       *icon_size = SizeStringToIconSize(iter->second);
     else if (scale_factor && iter->first == kScaleFactor)
-      web_ui_util::ParseScaleFactor(iter->second, scale_factor);
+      webui::ParseScaleFactor(iter->second, scale_factor);
   }
 }
 
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 18cb06d..2fa6568 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -34,7 +34,6 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -52,6 +51,7 @@
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/favicon_size.h"
+#include "ui/webui/web_ui_util.h"
 
 using application_launch::LaunchParams;
 using application_launch::OpenApplication;
@@ -487,7 +487,7 @@ void AppLauncherHandler::HandleLaunchApp(const ListValue* args) {
   Profile* profile = extension_service_->profile();
 
   WindowOpenDisposition disposition = args->GetSize() > 3 ?
-        web_ui_util::GetDispositionFromClick(args, 3) : CURRENT_TAB;
+        webui::GetDispositionFromClick(args, 3) : CURRENT_TAB;
   if (extension_id != extension_misc::kWebStoreAppId) {
     RecordAppLaunchByID(launch_bucket);
   } else {
diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc
index 1cbfdb0..dcf9db2 100644
--- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc
+++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc
@@ -22,14 +22,8 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/host_desktop.h"
-
-#if !defined(OS_ANDROID)
-#include "chrome/browser/ui/search/other_device_menu_controller.h"
-#endif
-
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/session_favicon_source.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
@@ -40,6 +34,11 @@
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/webui/web_ui_util.h"
+
+#if !defined(OS_ANDROID)
+#include "chrome/browser/ui/search/other_device_menu_controller.h"
+#endif
 
 namespace browser_sync {
 
@@ -325,8 +324,7 @@ void ForeignSessionHandler::HandleOpenForeignSession(const ListValue* args) {
   }
 
   if (tab_id != kInvalidId) {
-    WindowOpenDisposition disposition =
-        web_ui_util::GetDispositionFromClick(args, 3);
+    WindowOpenDisposition disposition = webui::GetDispositionFromClick(args, 3);
     OpenForeignSessionTab(
         web_ui(), session_string_value, window_num, tab_id, disposition);
   } else {
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
index a82ab64..68d400a 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
@@ -29,7 +29,6 @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
@@ -46,6 +45,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::OpenURLParams;
 using content::Referrer;
@@ -212,8 +212,7 @@ void NTPLoginHandler::UpdateLogin() {
         const gfx::Image* image =
             cache.GetGAIAPictureOfProfileAtIndex(profile_index);
         if (image)
-          icon_url = web_ui_util::GetBitmapDataUrl(
-              GetGAIAPictureForNTP(*image));
+          icon_url = webui::GetBitmapDataUrl(GetGAIAPictureForNTP(*image));
       }
       if (header.empty())
         header = CreateSpanWithClass(UTF8ToUTF16(username), "profile-name");
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 1ad5a8b..39f8aac 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -32,7 +32,6 @@
 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/browser/web_resource/notification_promo.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ -54,6 +53,7 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/sys_color_change_listener.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/platform_util.h"
@@ -291,7 +291,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
       prefs::kShowBookmarkBar);
   localized_strings.SetBoolean("bookmarkbarattached", bookmark_bar_attached);
 
-  web_ui_util::SetFontAndTextDirection(&localized_strings);
+  webui::SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
@@ -408,7 +408,7 @@ void NTPResourceCache::CreateNewTabHTML() {
   NewTabPageHandler::GetLocalizedValues(profile_, &load_time_data);
   NTPLoginHandler::GetLocalizedValues(profile_, &load_time_data);
 
-  web_ui_util::SetFontAndTextDirection(&load_time_data);
+  webui::SetFontAndTextDirection(&load_time_data);
 
   // Control fade and resize animations.
   load_time_data.SetBoolean("anim", ui::Animation::ShouldRenderRichAnimation());
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc
index ae06229..3a86b95 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc
@@ -12,7 +12,6 @@
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -21,6 +20,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 
@@ -102,7 +102,7 @@ void NTPResourceCache::CreateNewTabHTML() {
   localized_strings.SetString("bookmarkstitle",
       l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS));
 
-  web_ui_util::SetFontAndTextDirection(&localized_strings);
+  webui::SetFontAndTextDirection(&localized_strings);
 
   base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
                                  GetRawDataResource(IDR_NEW_TAB_ANDROID_HTML));
diff --git a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc
index adafeb8..fdc30a1 100644
--- a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc
+++ b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc
@@ -12,10 +12,10 @@
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
+#include "ui/webui/web_ui_util.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/sessions/session_restore.h"
@@ -107,8 +107,7 @@ void RecentlyClosedTabsHandler::HandleReopenTab(const ListValue* args) {
   chrome::HostDesktopType host_desktop_type =
       chrome::GetHostDesktopTypeForNativeView(
           web_ui()->GetWebContents()->GetNativeView());
-  WindowOpenDisposition disposition =
-      web_ui_util::GetDispositionFromClick(args, 2);
+  WindowOpenDisposition disposition = webui::GetDispositionFromClick(args, 2);
   tab_restore_service_->RestoreEntryById(delegate,
                                          static_cast<int>(session_to_restore),
                                          host_desktop_type,
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index e4ff6fd..9f28da8 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -21,12 +21,12 @@
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
@@ -427,7 +427,7 @@ void AutofillOptionsHandler::LoadAutofillData() {
     entry->Append(new StringValue((*i)->Label()));
     int res = CreditCardTypeToResourceID((*i)->type());
     entry->Append(
-        new StringValue(web_ui_util::GetBitmapDataUrlFromResource(res)));
+        new StringValue(webui::GetBitmapDataUrlFromResource(res)));
     entry->Append(new StringValue(LocalizedCreditCardType((*i)->type())));
     credit_cards.Append(entry);
   }
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index faf8424..ce74cef 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -52,7 +52,6 @@
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
@@ -78,6 +77,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/webui/web_ui_util.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
@@ -956,7 +956,7 @@ scoped_ptr<ListValue> BrowserOptionsHandler::GetProfilesInfoList() {
       gfx::Image icon = profiles::GetAvatarIconForWebUI(
           cache.GetAvatarIconOfProfileAtIndex(i), true);
       profile_value->SetString("iconURL",
-          web_ui_util::GetBitmapDataUrl(icon.AsBitmap()));
+          webui::GetBitmapDataUrl(icon.AsBitmap()));
     } else {
       size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(i);
       profile_value->SetString("iconURL",
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index 8467316..70c564e 100644
--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -35,6 +34,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/widget/widget.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace chromeos {
 namespace options {
@@ -226,7 +226,7 @@ void ChangePictureOptionsHandler::SendSelectedImage() {
     case User::kExternalImageIndex: {
       // User has image from camera/file, record it and add to the image list.
       previous_image_ = user->image();
-      SendOldImage(web_ui_util::GetBitmapDataUrl(*previous_image_.bitmap()));
+      SendOldImage(webui::GetBitmapDataUrl(*previous_image_.bitmap()));
       break;
     }
     case User::kProfileImageIndex: {
@@ -253,7 +253,7 @@ void ChangePictureOptionsHandler::SendSelectedImage() {
 
 void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image,
                                                    bool should_select) {
-  base::StringValue data_url(web_ui_util::GetBitmapDataUrl(*image.bitmap()));
+  base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap()));
   base::FundamentalValue select(should_select);
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
                                    data_url, select);
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 84d86cc..cb2947a 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -44,7 +44,6 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/singleton_tabs.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/time_format.h"
@@ -67,6 +66,7 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
@@ -267,7 +267,7 @@ class NetworkInfoDictionary {
   }
   void set_icon(const gfx::ImageSkia& icon) {
     gfx::ImageSkiaRep image_rep = icon.GetRepresentation(icon_scale_factor_);
-    icon_url_ = icon.isNull() ? "" : web_ui_util::GetBitmapDataUrl(
+    icon_url_ = icon.isNull() ? "" : webui::GetBitmapDataUrl(
         image_rep.sk_bitmap());
   }
   void set_name(const std::string& name) {
@@ -1019,7 +1019,7 @@ std::string InternetOptionsHandler::GetIconDataUrl(int resource_id) const {
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   gfx::ImageSkiaRep image_rep = icon->GetRepresentation(
       web_ui()->GetDeviceScaleFactor());
-  return web_ui_util::GetBitmapDataUrl(image_rep.sk_bitmap());
+  return webui::GetBitmapDataUrl(image_rep.sk_bitmap());
 }
 
 void InternetOptionsHandler::RefreshNetworkData() {
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index 47bab0a..9143e0c 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
@@ -9,12 +9,12 @@
 #include "base/string_split.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_parse.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
@@ -31,7 +31,7 @@ void ParseRequest(const GURL& url,
                   bool* is_image_animated,
                   ui::ScaleFactor* scale_factor) {
   DCHECK(url.is_valid());
-  web_ui_util::ParsePathAndScale(url, email, scale_factor);
+  webui::ParsePathAndScale(url, email, scale_factor);
   std::string url_spec = url.possibly_invalid_spec();
   url_parse::Component query = url.parsed_for_possibly_invalid_spec().query;
   url_parse::Component key, value;
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index 25481b1..5dcb65c 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -20,12 +20,12 @@
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace options {
 
@@ -162,7 +162,7 @@ void ManageProfileHandler::SendProfileIcons(
         cache.GetGAIAPictureOfProfileAtIndex(profile_index);
     if (icon) {
       gfx::Image icon2 = profiles::GetAvatarIconForWebUI(*icon, true);
-      gaia_picture_url_ = web_ui_util::GetBitmapDataUrl(icon2.AsBitmap());
+      gaia_picture_url_ = webui::GetBitmapDataUrl(icon2.AsBitmap());
       image_url_list.Append(new base::StringValue(gaia_picture_url_));
     }
   }
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index 86770d7..2b80d5a 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -43,7 +43,6 @@
 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_types.h"
@@ -60,6 +59,7 @@
 #include "net/base/escape.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
+#include "ui/webui/web_ui_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
@@ -139,7 +139,7 @@ void OptionsUIHTMLSource::StartDataRequest(
     bool is_incognito,
     const content::URLDataSource::GotDataCallback& callback) {
   scoped_refptr<base::RefCountedMemory> response_bytes;
-  web_ui_util::SetFontAndTextDirection(localized_strings_.get());
+  webui::SetFontAndTextDirection(localized_strings_.get());
 
   if (path == kLocalizedStringsFile) {
     // Return dynamically-generated strings from memory.
diff --git a/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc b/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc
index 65a6d2b..feb7496 100644
--- a/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc
+++ b/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
@@ -27,6 +26,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ -82,7 +82,7 @@ std::string TabModalConfirmDialogWebUI::GetDialogArgs() const {
   dict.SetString("message", delegate_->GetMessage());
   dict.SetString("accept", delegate_->GetAcceptButtonTitle());
   dict.SetString("cancel", delegate_->GetCancelButtonTitle());
-  web_ui_util::SetFontAndTextDirection(&dict);
+  webui::SetFontAndTextDirection(&dict);
   std::string json;
   base::JSONWriter::Write(&dict, &json);
   return json;
diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
index cd04624..93dc65f 100644
--- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/host_desktop.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ -23,6 +22,7 @@
 #include "content/public/browser/web_ui.h"
 #include "ui/gfx/image/image_skia.h"
 #include "webkit/glue/webpreferences.h"
+#include "ui/webui/web_ui_util.h"
 
 namespace {
 
@@ -344,7 +344,7 @@ base::Value* TaskManagerHandler::CreateColumnValue(
     const gfx::ImageSkiaRep image_rep =
         image.GetRepresentation(icon_scale_factor);
     return Value::CreateStringValue(
-        web_ui_util::GetBitmapDataUrl(image_rep.sk_bitmap()));
+        webui::GetBitmapDataUrl(image_rep.sk_bitmap()));
   }
   if (column_name == "title")
     return Value::CreateStringValue(model_->GetResourceTitle(i));
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 9a2e213..d43ef38 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -13,13 +13,13 @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 
@@ -59,9 +59,9 @@ void ThemeSource::StartDataRequest(
   // Default scale factor if not specified.
   ui::ScaleFactor scale_factor;
   std::string uncached_path;
-  web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
-                                 &uncached_path,
-                                 &scale_factor);
+  webui::ParsePathAndScale(GURL(GetThemePath() + path),
+                           &uncached_path,
+                           &scale_factor);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
@@ -86,8 +86,7 @@ void ThemeSource::StartDataRequest(
 
 std::string ThemeSource::GetMimeType(const std::string& path) const {
   std::string uncached_path;
-  web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
-                                 &uncached_path, NULL);
+  webui::ParsePathAndScale(GURL(GetThemePath() + path), &uncached_path, NULL);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
@@ -100,8 +99,7 @@ std::string ThemeSource::GetMimeType(const std::string& path) const {
 MessageLoop* ThemeSource::MessageLoopForRequestPath(
     const std::string& path) const {
   std::string uncached_path;
-  web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
-                                 &uncached_path, NULL);
+  webui::ParsePathAndScale(GURL(GetThemePath() + path), &uncached_path, NULL);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
diff --git a/chrome/browser/ui/webui/web_ui_util.cc b/chrome/browser/ui/webui/web_ui_util.cc
deleted file mode 100644
index 3fa4f3a..0000000
--- a/chrome/browser/ui/webui/web_ui_util.cc
+++ /dev/null
@@ -1,161 +0,0 @@
-// 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/browser/ui/webui/web_ui_util.h"
-
-#include <vector>
-
-#include "base/base64.h"
-#include "base/debug/trace_event.h"
-#include "base/i18n/rtl.h"
-#include "base/logging.h"
-#include "base/memory/ref_counted_memory.h"
-#include "googleurl/src/gurl.h"
-#include "net/base/escape.h"
-#include "grit/app_locale_settings.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/window_open_disposition.h"
-#include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/base/l10n/l10n_util.h"
-
-#if defined (TOOLKIT_GTK)
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/font.h"
-#endif
-
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
-namespace {
-
-struct ScaleFactorMap {
-  const char* name;
-  ui::ScaleFactor scale_factor;
-};
-
-const ScaleFactorMap kScaleFactorMap[] = {
-  { "1x", ui::SCALE_FACTOR_100P },
-  { "2x", ui::SCALE_FACTOR_200P },
-};
-
-}  // namespace
-
-namespace web_ui_util {
-
-std::string GetBitmapDataUrl(const SkBitmap& bitmap) {
-  TRACE_EVENT2("oobe", "GetImageDataUrl",
-               "width", bitmap.width(), "height", bitmap.height());
-  std::vector<unsigned char> output;
-  gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &output);
-  std::string str_url;
-  str_url.insert(str_url.end(), output.begin(), output.end());
-
-  base::Base64Encode(str_url, &str_url);
-  str_url.insert(0, "data:image/png;base64,");
-  return str_url;
-}
-
-std::string GetBitmapDataUrlFromResource(int res) {
-  // Load resource icon and covert to base64 encoded data url
-  base::RefCountedStaticMemory* icon_data =
-      ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
-          res, ui::SCALE_FACTOR_100P);
-  if (!icon_data)
-    return std::string();
-  scoped_refptr<base::RefCountedMemory> raw_icon(icon_data);
-  std::string str_url;
-  str_url.insert(str_url.end(),
-    raw_icon->front(),
-    raw_icon->front() + raw_icon->size());
-  base::Base64Encode(str_url, &str_url);
-  str_url.insert(0, "data:image/png;base64,");
-  return str_url;
-}
-
-WindowOpenDisposition GetDispositionFromClick(const ListValue* args,
-                                              int start_index) {
-  double button = 0.0;
-  bool alt_key = false;
-  bool ctrl_key = false;
-  bool meta_key = false;
-  bool shift_key = false;
-
-  CHECK(args->GetDouble(start_index++, &button));
-  CHECK(args->GetBoolean(start_index++, &alt_key));
-  CHECK(args->GetBoolean(start_index++, &ctrl_key));
-  CHECK(args->GetBoolean(start_index++, &meta_key));
-  CHECK(args->GetBoolean(start_index++, &shift_key));
-  return ui::DispositionFromClick(
-      button == 1.0, alt_key, ctrl_key, meta_key, shift_key);
-}
-
-bool ParseScaleFactor(const base::StringPiece& identifier,
-                      ui::ScaleFactor* scale_factor) {
-  *scale_factor = ui::SCALE_FACTOR_100P;
-  for (size_t i = 0; i < arraysize(kScaleFactorMap); i++) {
-    if (identifier == kScaleFactorMap[i].name) {
-      *scale_factor = kScaleFactorMap[i].scale_factor;
-      return true;
-    }
-  }
-  return false;
-}
-
-void ParsePathAndScale(const GURL& url,
-                       std::string* path,
-                       ui::ScaleFactor* scale_factor) {
-  *path = net::UnescapeURLComponent(url.path().substr(1),
-                                    (net::UnescapeRule::URL_SPECIAL_CHARS |
-                                     net::UnescapeRule::SPACES));
-  if (scale_factor)
-    *scale_factor = ui::SCALE_FACTOR_100P;
-
-  // Detect and parse resource string ending in @<scale>x.
-  std::size_t pos = path->rfind('@');
-  if (pos != std::string::npos) {
-    base::StringPiece stripped_path(*path);
-    ui::ScaleFactor factor;
-
-    if (ParseScaleFactor(stripped_path.substr(
-            pos + 1, stripped_path.length() - pos - 1), &factor)) {
-      // Strip scale factor specification from path.
-      stripped_path.remove_suffix(stripped_path.length() - pos);
-      stripped_path.CopyToString(path);
-    }
-    if (scale_factor)
-      *scale_factor = factor;
-  }
-}
-
-// static
-void SetFontAndTextDirection(DictionaryValue* localized_strings) {
-  int web_font_family_id = IDS_WEB_FONT_FAMILY;
-  int web_font_size_id = IDS_WEB_FONT_SIZE;
-#if defined(OS_WIN)
-  // Vary font settings for Windows XP.
-  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
-    web_font_family_id = IDS_WEB_FONT_FAMILY_XP;
-    web_font_size_id = IDS_WEB_FONT_SIZE_XP;
-  }
-#endif
-
-  std::string font_family = l10n_util::GetStringUTF8(web_font_family_id);
-
-#if defined(TOOLKIT_GTK)
-  // Use the system font on Linux/GTK. Keep the hard-coded font families as
-  // backup in case for some crazy reason this one isn't available.
-  font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
-      ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
-#endif
-
-  localized_strings->SetString("fontfamily", font_family);
-  localized_strings->SetString("fontsize",
-      l10n_util::GetStringUTF8(web_font_size_id));
-  localized_strings->SetString("textdirection",
-      base::i18n::IsRTL() ? "rtl" : "ltr");
-}
-
-}  // namespace web_ui_util
diff --git a/chrome/browser/ui/webui/web_ui_util.h b/chrome/browser/ui/webui/web_ui_util.h
deleted file mode 100644
index 19bfdac..0000000
--- a/chrome/browser/ui/webui/web_ui_util.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_UI_WEBUI_WEB_UI_UTIL_H_
-#define CHROME_BROWSER_UI_WEBUI_WEB_UI_UTIL_H_
-
-#include <string>
-
-#include "base/string_piece.h"
-#include "base/values.h"
-#include "ui/base/layout.h"
-#include "ui/base/window_open_disposition.h"
-
-class GURL;
-class SkBitmap;
-
-namespace web_ui_util {
-
-// Convenience routine to convert SkBitmap object to data url
-// so that it can be used in WebUI.
-std::string GetBitmapDataUrl(const SkBitmap& bitmap);
-
-// Convenience routine to get data url that corresponds to given
-// resource_id as a bitmap. This function does not check if the
-// resource for the |resource_id| is a bitmap, therefore it is the
-// caller's responsibility to make sure the resource is indeed a
-// bitmap. Returns empty string if a resource does not exist for given
-// |resource_id|.
-std::string GetBitmapDataUrlFromResource(int resource_id);
-
-// Extracts a disposition from click event arguments. |args| should contain
-// an integer button and booleans alt key, ctrl key, meta key, and shift key
-// (in that order), starting at |start_index|.
-WindowOpenDisposition GetDispositionFromClick(const ListValue* args,
-                                              int start_index);
-
-// Given a scale factor such as "1x" or "2x", sets |scale_factor| to the
-// ScaleFactor enum value for this scale factor. If the scale factor could not
-// be determined correctly from the string, then |scale_factor| is set to
-// SCALE_FACTOR_NONE, and false is returned.
-bool ParseScaleFactor(const base::StringPiece& identifier,
-                      ui::ScaleFactor* scale_factor);
-
-// Parses a URL containing some path @{scale}x. If it does not contain a scale
-// factor then the default scale factor is returned.
-void ParsePathAndScale(const GURL& url,
-                       std::string* path,
-                       ui::ScaleFactor* scale_factor);
-
-// Helper function to set the font family, size, and text direction into the
-// given dictionary.
-void SetFontAndTextDirection(base::DictionaryValue* localized_strings);
-
-}  // namespace web_ui_util
-
-#endif  // CHROME_BROWSER_UI_WEBUI_WEB_UI_UTIL_H_
diff --git a/chrome/browser/ui/webui/web_ui_util_unittest.cc b/chrome/browser/ui/webui/web_ui_util_unittest.cc
deleted file mode 100644
index 63d3b44..0000000
--- a/chrome/browser/ui/webui/web_ui_util_unittest.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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/browser/ui/webui/web_ui_util.h"
-
-#include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-TEST(WebUIUtilTest, ParsePathAndScale) {
-  GURL url("chrome://some/random/username@email/and/more");
-  std::string path;
-  ui::ScaleFactor factor;
-
-  web_ui_util::ParsePathAndScale(url, &path, &factor);
-  EXPECT_EQ("random/username@email/and/more", path);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, factor);
-
-  GURL url2("chrome://some/random/username@email/and/more@2x");
-  web_ui_util::ParsePathAndScale(url2, &path, &factor);
-  EXPECT_EQ("random/username@email/and/more", path);
-  EXPECT_EQ(ui::SCALE_FACTOR_200P, factor);
-
-  GURL url3("chrome://some/random/username/and/more@2x");
-  web_ui_util::ParsePathAndScale(url3, &path, &factor);
-  EXPECT_EQ("random/username/and/more", path);
-  EXPECT_EQ(ui::SCALE_FACTOR_200P, factor);
-
-  GURL url4("chrome://some/random/username/and/more");
-  web_ui_util::ParsePathAndScale(url4, &path, &factor);
-  EXPECT_EQ("random/username/and/more", path);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, factor);
-}
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index f0c7ffd..3631eec 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2155,8 +2155,6 @@
         'browser/ui/webui/version_handler_chromeos.h',
         'browser/ui/webui/version_ui.cc',
         'browser/ui/webui/version_ui.h',
-        'browser/ui/webui/web_ui_util.cc',
-        'browser/ui/webui/web_ui_util.h',
         'browser/ui/webui/webrtc_internals_ui.cc',
         'browser/ui/webui/webrtc_internals_ui.h',
         'browser/ui/webui/welcome_ui_android.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0b2977d..1b27269 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1434,7 +1434,6 @@
         'browser/ui/webui/theme_source_unittest.cc',
         'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc',
         'browser/ui/webui/web_ui_unittest.cc',
-        'browser/ui/webui/web_ui_util_unittest.cc',
         'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
         'browser/ui/window_sizer/window_sizer_common_unittest.cc',
         'browser/ui/window_sizer/window_sizer_unittest.cc',