Integrate About page into Settings for Chrome OS settings in a window.

chrome/browser/ui/webui/help/version_updater_chromeos.cc

Index: chrome/browser/ui/webui/help/version_updater_chromeos.cc
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index e6c2f2afe8fa893afd418ce55719ccaf8c843c4f..e3f60a39e79168f2fa104c12430a2f89dec4c8e9 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
+#include "chrome/browser/ui/webui/help/help_utils.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/network/network_handler.h"
@@ -54,7 +54,7 @@ NetworkStatus GetNetworkStatus(const chromeos::NetworkState* network) {
   if (network->type() == shill::kTypeBluetooth)
     return NETWORK_STATUS_DISALLOWED;
   if (network->type() == shill::kTypeCellular &&
-      !help_utils_chromeos::IsUpdateOverCellularAllowed()) {
+      !help_utils::IsUpdateOverCellularAllowed()) {
     return NETWORK_STATUS_DISALLOWED;
   }
   return NETWORK_STATUS_ALLOWED;
@@ -104,7 +104,7 @@ void VersionUpdaterCros::CheckForUpdate(const StatusCallback& callback) {
     base::string16 message =
         l10n_util::GetStringFUTF16(
             IDS_UPGRADE_DISALLOWED,
-            help_utils_chromeos::GetConnectionTypeAsUTF16(network->type()));
+            help_utils::GetConnectionTypeAsUTF16(network->type()));
     callback_.Run(FAILED_CONNECTION_TYPE_DISALLOWED, 0, message);
     return;
   }