PART1: Initiated the SignedSettings refactoring.

chrome/browser/chromeos/login/existing_user_controller.h

 // 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_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/task.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/login/captcha_view.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/login_performer.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/ownership_status_checker.h"
 #include "chrome/browser/chromeos/login/password_changed_view.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/wm_message_listener.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "ui/gfx/rect.h"
 
 namespace chromeos {
 
 class LoginDisplayHost;
-class UserCrosSettingsProvider;
+class CrosSettings;
 
 // ExistingUserController is used to handle login when someone has
 // already logged into the machine.
 // To use ExistingUserController create an instance of it and invoke Init.
 // When Init is called it creates LoginDisplay instance which encapsulates
 // all login UI implementation.
 // ExistingUserController maintains it's own life cycle and deletes itself when
 // the user logs in (or chooses to see other settings).
 class ExistingUserController : public LoginDisplay::Delegate,
                                public NotificationObserver,
@@ skipping 125 matching lines @@
 
   // Number of login attempts. Used to show help link when > 1 unsuccessful
   // logins for the same user.
   size_t num_login_attempts_;
 
   // Pointer to the current instance of the controller to be used by
   // automation tests.
   static ExistingUserController* current_controller_;
 
   // Triggers prefetching of user settings.
-  scoped_ptr<UserCrosSettingsProvider> user_settings_;
+  CrosSettings* user_settings_;
 
   // URL to append to start Guest mode with.
   GURL guest_mode_url_;
 
   // Used for user image changed notifications.
   NotificationRegistrar registrar_;
 
   // Factory of callbacks.
-  ScopedRunnableMethodFactory<ExistingUserController> method_factory_;
+  base::WeakPtrFactory<ExistingUserController> pointer_factory_;
 
   // Whether everything is ready to launch the browser.
   bool ready_for_browser_launch_;
 
   // Whether two factor credentials were used.
   bool two_factor_credentials_;
 
   // Used to verify ownership before starting enterprise enrollment.
   scoped_ptr<OwnershipStatusChecker> ownership_checker_;
 
   // Whether it's first login to the device and this user will be owner.
   bool is_owner_login_;
 
   FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, NewUserLogin);
 
   DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_