Remove "2" suffixes from options2 code.

chrome/browser/chromeos/login/user_manager.h

 // 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_CHROMEOS_LOGIN_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 #pragma once
 
 #include <string>
 
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "base/memory/singleton.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/login/user.h"
-#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h"
 
 class SkBitmap;
 class FilePath;
 class PrefService;
 
 namespace chromeos {
 
 class RemoveUserDelegate;
 class UserImage;
 
@@ skipping 230 matching lines @@
   virtual void NotifyLocalStateChanged() = 0;
 
   // Returns the result of the last successful profile image download, if any.
   // Otherwise, returns an empty bitmap.
   virtual const SkBitmap& DownloadedProfileImage() const = 0;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_