WebUI: Rename namespace dom_ui_util to web_ui_util.

BUG=59945
TEST=trybots

Review URL: http://codereview.chromium.org/6392013

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

17 files changed, 57 insertions, 57 deletions

diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc
index 6b36407..b811a3b 100644
--- a/chrome/browser/browser_signin.cc
+++ b/chrome/browser/browser_signin.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -16,8 +16,8 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/constrained_html_ui.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -192,7 +192,7 @@ void BrowserSigninHtml::HandleSigninInit(const ListValue* args) {
 }
 
 void BrowserSigninHtml::HandleSubmitAuth(const ListValue* args) {
-  std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+  std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
   scoped_ptr<DictionaryValue> result(static_cast<DictionaryValue*>(
       base::JSONReader::Read(json, false)));
   std::string username;
diff --git a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc
index c0a5648..043b825 100644
--- a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -10,7 +10,7 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -93,7 +93,7 @@ void AccountsOptionsHandler::FetchUserPictures(const ListValue* args) {
        it < users.end(); ++it) {
     if (!it->image().isNull()) {
       StringValue* picture = new StringValue(
-          dom_ui_util::GetImageDataUrl(it->image()));
+          web_ui_util::GetImageDataUrl(it->image()));
       // SetWithoutPathExpansion because email has "." in it.
       user_pictures.SetWithoutPathExpansion(it->email(), picture);
     }
diff --git a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc b/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc
index 88ee071..2305f3e 100644
--- a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,7 +6,7 @@
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -40,7 +40,7 @@ void CrosPersonalOptionsHandler::LoadAccountPicture(const ListValue* args) {
       UserManager::Get()->logged_in_user().image();
 
   if (!account_picture.isNull()) {
-    StringValue data_url(dom_ui_util::GetImageDataUrl(account_picture));
+    StringValue data_url(web_ui_util::GetImageDataUrl(account_picture));
     dom_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture",
         data_url);
   }
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
index 2b308f7..15153ce 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -24,7 +24,7 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/time_format.h"
@@ -889,7 +889,7 @@ ListValue* InternetOptionsHandler::GetNetwork(
   network->Append(Value::CreateBooleanValue(connecting));
   // 6) icon data url
   network->Append(Value::CreateStringValue(icon.isNull() ? "" :
-      dom_ui_util::GetImageDataUrl(icon)));
+      web_ui_util::GetImageDataUrl(icon)));
   // 7) remembered
   network->Append(Value::CreateBooleanValue(remembered));
   // 8) activation state
diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc
index 2d362d3..915e15c 100644
--- a/chrome/browser/chromeos/dom_ui/menu_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -19,7 +19,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/views/domui_menu_widget.h"
 #include "chrome/browser/chromeos/views/native_menu_domui.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/url_constants.h"
@@ -100,9 +100,9 @@ SkBitmap CreateMenuScrollArrowImage(bool up) {
 // "down" image otherwise.
 const std::string& GetImageDataUrlForMenuScrollArrow(bool up) {
   static const std::string upImage =
-      dom_ui_util::GetImageDataUrl(CreateMenuScrollArrowImage(true));
+      web_ui_util::GetImageDataUrl(CreateMenuScrollArrowImage(true));
   static const std::string downImage =
-      dom_ui_util::GetImageDataUrl(CreateMenuScrollArrowImage(false));
+      web_ui_util::GetImageDataUrl(CreateMenuScrollArrowImage(false));
   return up ? upImage : downImage;
 }
 
@@ -110,9 +110,9 @@ const std::string& GetImageDataUrlForMenuScrollArrow(bool up) {
 // "off" image otherwise.
 const std::string& GetImageDataUrlForRadio(bool on) {
   static const std::string onImage =
-      dom_ui_util::GetImageDataUrl(*views::GetRadioButtonImage(true));
+      web_ui_util::GetImageDataUrl(*views::GetRadioButtonImage(true));
   static const std::string offImage =
-       dom_ui_util::GetImageDataUrl(*views::GetRadioButtonImage(false));
+      web_ui_util::GetImageDataUrl(*views::GetRadioButtonImage(false));
   return on ? onImage : offImage;
 }
 
@@ -139,9 +139,9 @@ std::string GetMenuUIHTMLSourceFromString(
   value_config.SetString("radioOnUrl", GetImageDataUrlForRadio(true));
   value_config.SetString("radioOffUrl", GetImageDataUrlForRadio(false));
   value_config.SetString(
-      "arrowUrl", dom_ui_util::GetImageDataUrlFromResource(IDR_MENU_ARROW));
+      "arrowUrl", web_ui_util::GetImageDataUrlFromResource(IDR_MENU_ARROW));
   value_config.SetString(
-      "checkUrl", dom_ui_util::GetImageDataUrlFromResource(IDR_MENU_CHECK));
+      "checkUrl", web_ui_util::GetImageDataUrlFromResource(IDR_MENU_CHECK));
 
   value_config.SetString(
       "scrollUpUrl", GetImageDataUrlForMenuScrollArrow(true));
@@ -622,7 +622,7 @@ DictionaryValue* MenuUI::CreateMenuItem(const ui::MenuModel* model,
       "font", GetFontShorthand(model->GetLabelFontAt(index)));
   SkBitmap icon;
   if (model->GetIconAt(index, &icon) && !icon.isNull() && !icon.empty()) {
-    item->SetString("icon", dom_ui_util::GetImageDataUrl(icon));
+    item->SetString("icon", web_ui_util::GetImageDataUrl(icon));
     *max_icon_width = std::max(*max_icon_width, icon.width());
   }
   views::Accelerator menu_accelerator;
diff --git a/chrome/browser/chromeos/notifications/system_notification.cc b/chrome/browser/chromeos/notifications/system_notification.cc
index 42c46d1..ad45b4f 100644
--- a/chrome/browser/chromeos/notifications/system_notification.cc
+++ b/chrome/browser/chromeos/notifications/system_notification.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,7 +7,7 @@
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/notifications/system_notification_factory.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 
@@ -16,7 +16,7 @@ namespace chromeos {
 void SystemNotification::Init(int icon_resource_id) {
   collection_ = static_cast<BalloonCollectionImpl*>(
        g_browser_process->notification_ui_manager()->balloon_collection());
-  std::string url = dom_ui_util::GetImageDataUrlFromResource(icon_resource_id);
+  std::string url = web_ui_util::GetImageDataUrlFromResource(icon_resource_id);
   DCHECK(!url.empty());
   GURL tmp_gurl(url);
   icon_.Swap(&tmp_gurl);
diff --git a/chrome/browser/dom_ui/constrained_html_ui.cc b/chrome/browser/dom_ui/constrained_html_ui.cc
index 75aeda1..c3cfe0f 100644
--- a/chrome/browser/dom_ui/constrained_html_ui.cc
+++ b/chrome/browser/dom_ui/constrained_html_ui.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/dom_ui/constrained_html_ui.h"
 
 #include "base/lazy_instance.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/bindings_policy.h"
@@ -42,7 +42,7 @@ void ConstrainedHtmlUI::RenderViewCreated(
 
 void ConstrainedHtmlUI::OnDialogClose(const ListValue* args) {
   GetConstrainedDelegate()->GetHtmlDialogUIDelegate()->OnDialogClosed(
-      dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+      web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
   GetConstrainedDelegate()->OnDialogClose();
 }
 
diff --git a/chrome/browser/dom_ui/html_dialog_ui.cc b/chrome/browser/dom_ui/html_dialog_ui.cc
index fbea1f6..d6c1d54 100644
--- a/chrome/browser/dom_ui/html_dialog_ui.cc
+++ b/chrome/browser/dom_ui/html_dialog_ui.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,7 +7,7 @@
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/bindings_policy.h"
@@ -67,7 +67,7 @@ void HtmlDialogUI::OnDialogClosed(const ListValue* args) {
       tab_contents()->property_bag());
   if (delegate) {
     (*delegate)->OnDialogClosed(
-        dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+        web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
   }
 }
 
diff --git a/chrome/browser/dom_ui/ntp_login_handler.cc b/chrome/browser/dom_ui/ntp_login_handler.cc
index 67939d0..4f57e4a 100644
--- a/chrome/browser/dom_ui/ntp_login_handler.cc
+++ b/chrome/browser/dom_ui/ntp_login_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/values.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/dom_ui/options/autofill_options_handler.cc b/chrome/browser/dom_ui/options/autofill_options_handler.cc
index 277c4d3..6c3f520 100644
--- a/chrome/browser/dom_ui/options/autofill_options_handler.cc
+++ b/chrome/browser/dom_ui/options/autofill_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,7 +13,7 @@
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/guid.h"
 #include "grit/generated_resources.h"
@@ -199,7 +199,7 @@ void AutoFillOptionsHandler::LoadAutoFillData() {
     entry->Append(new StringValue((*i)->PreviewSummary()));
     int res = CreditCardTypeToResourceID((*i)->type());
     entry->Append(
-        new StringValue(dom_ui_util::GetImageDataUrlFromResource(res)));
+        new StringValue(web_ui_util::GetImageDataUrlFromResource(res)));
     credit_cards.Append(entry);
   }
 
diff --git a/chrome/browser/dom_ui/dom_ui_util.cc b/chrome/browser/dom_ui/web_ui_util.cc
index 6f0c160..ad76b83 100644
--- a/chrome/browser/dom_ui/dom_ui_util.cc
+++ b/chrome/browser/dom_ui/web_ui_util.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 
 #include <vector>
 
@@ -12,7 +12,7 @@
 #include "gfx/codec/png_codec.h"
 #include "ui/base/resource/resource_bundle.h"
 
-namespace dom_ui_util {
+namespace web_ui_util {
 
 std::string GetJsonResponseFromFirstArgumentInList(const ListValue* args) {
   return GetJsonResponseFromArgumentList(args, 0);
@@ -61,4 +61,4 @@ std::string GetImageDataUrlFromResource(int res) {
   return str_url;
 }
 
-}  // end of namespace dom_ui_util
+}  // namespace web_ui_util
diff --git a/chrome/browser/dom_ui/dom_ui_util.h b/chrome/browser/dom_ui/web_ui_util.h
index 335ef05..07a063e 100644
--- a/chrome/browser/dom_ui/dom_ui_util.h
+++ b/chrome/browser/dom_ui/web_ui_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_DOM_UI_DOM_UI_UTIL_H_
-#define CHROME_BROWSER_DOM_UI_DOM_UI_UTIL_H_
+#ifndef CHROME_BROWSER_DOM_UI_WEB_UI_UTIL_H_
+#define CHROME_BROWSER_DOM_UI_WEB_UI_UTIL_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,7 @@
 class ListValue;
 class SkBitmap;
 
-namespace dom_ui_util {
+namespace web_ui_util {
 
 // Convenience routine to get the response string from an argument
 // list.  Typically used when supporting a DOMUI and getting calls
@@ -44,6 +44,6 @@ std::string GetImageDataUrl(const SkBitmap& bitmap);
 // |resource_id|.
 std::string GetImageDataUrlFromResource(int resource_id);
 
-}  // end of namespace
+}  // namespace web_ui_util
 
-#endif  // CHROME_BROWSER_DOM_UI_DOM_UI_UTIL_H_
+#endif  // CHROME_BROWSER_DOM_UI_WEB_UI_UTIL_H_
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
index d0507fb..a9d29d6 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc
index 0bbd25d..dfaf92c 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,7 +7,7 @@
 #include "base/scoped_ptr.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 
 DOMMessageHandler* CloudPrintSetupMessageHandler::Attach(DOMUI* dom_ui) {
@@ -26,7 +26,7 @@ void CloudPrintSetupMessageHandler::RegisterMessages() {
 }
 
 void CloudPrintSetupMessageHandler::HandleSubmitAuth(const ListValue* args) {
-  std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+  std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
   std::string username, password, captcha;
   if (json.empty())
     return;
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index f2fccf4..1013aed 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
@@ -349,7 +349,7 @@ void CloudPrintFlowHandler::HandleSendPrintData(const ListValue* args) {
 }
 
 void CloudPrintFlowHandler::HandleSetPageParameters(const ListValue* args) {
-  std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+  std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
   if (json.empty())
     return;
 
diff --git a/chrome/browser/remoting/setup_flow_login_step.cc b/chrome/browser/remoting/setup_flow_login_step.cc
index ada7d2f..0450e29 100644
--- a/chrome/browser/remoting/setup_flow_login_step.cc
+++ b/chrome/browser/remoting/setup_flow_login_step.cc
@@ -9,7 +9,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/remoting/setup_flow_get_status_step.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index e0d54dc..455818f 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -11,7 +11,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/dom_ui_util.h"
+#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -184,7 +184,7 @@ static void DisablePasswordSync(ProfileSyncService* service) {
 }
 
 void FlowHandler::HandleSubmitAuth(const ListValue* args) {
-  std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+  std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
   std::string username, password, captcha, access_code;
   if (json.empty())
     return;
@@ -201,7 +201,7 @@ void FlowHandler::HandleSubmitAuth(const ListValue* args) {
 }
 
 void FlowHandler::HandleConfigure(const ListValue* args) {
-  std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+  std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
   SyncConfiguration configuration;
 
   if (json.empty())
@@ -221,7 +221,7 @@ void FlowHandler::HandleConfigure(const ListValue* args) {
 }
 
 void FlowHandler::HandlePassphraseEntry(const ListValue* args) {
-  std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+  std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
 
   if (json.empty())
     return;
@@ -243,7 +243,7 @@ void FlowHandler::HandlePassphraseCancel(const ListValue* args) {
 }
 
 void FlowHandler::HandleFirstPassphrase(const ListValue* args) {
-  std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(args));
+  std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
 
   if (json.empty())
     return;