Options: Rename options2 namespace to options.

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index a35c5767a4ee56d8c15da832456ede0440de2d58..e2d475ebb8bb2a6d3e91497256165e9863a80e3b 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -176,14 +176,14 @@ OobeUI::OobeUI(content::WebUI* web_ui)
   ChromeURLDataManager::AddDataSource(profile, html_source);
 
   // Set up the chrome://userimage/ source.
-  options2::UserImageSource* user_image_source =
-      new options2::UserImageSource();
+  options::UserImageSource* user_image_source =
+      new options::UserImageSource();
   ChromeURLDataManager::AddDataSource(profile, user_image_source);
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe)) {
     // Set up the chrome://wallpaper/ source.
-    chromeos::options2::WallpaperImageSource* wallpaper_image_source =
-        new chromeos::options2::WallpaperImageSource();
+    chromeos::options::WallpaperImageSource* wallpaper_image_source =
+        new chromeos::options::WallpaperImageSource();
     ChromeURLDataManager::AddDataSource(profile, wallpaper_image_source);
   }
 }