cros: Replace WizardController string constants with OobeScreen values.

chrome/browser/chromeos/login/screen_manager.cc

Index: chrome/browser/chromeos/login/screen_manager.cc
diff --git a/chrome/browser/chromeos/login/screen_manager.cc b/chrome/browser/chromeos/login/screen_manager.cc
index 8b2e4c6a384b27ab119c4b5f5f5bd70e334df096..8457c5a667114757f4e2400c5e5c3ad654f67ed6 100644
--- a/chrome/browser/chromeos/login/screen_manager.cc
+++ b/chrome/browser/chromeos/login/screen_manager.cc
@@ -12,19 +12,19 @@ ScreenManager::ScreenManager() {
 ScreenManager::~ScreenManager() {
 }
 
-BaseScreen* ScreenManager::GetScreen(const std::string& screen_name) {
-  ScreenMap::const_iterator iter = screens_.find(screen_name);
-  if (iter != screens_.end()) {
+BaseScreen* ScreenManager::GetScreen(OobeScreen screen) {
+  auto iter = screens_.find(screen);

[achuithb, 2017/01/06 00:13:24]

Does const auto& not work here? Because the type is const_iterator? 

[jdufault, 2017/01/09 19:13:34]

Is that safe? It seems like std::map::find could return a stack value when the
element is not found.

+  if (iter != screens_.end())
     return iter->second.get();
-  }
-  BaseScreen* result = CreateScreen(screen_name);
-  DCHECK(result) << "Can not create screen named " << screen_name;
-  screens_[screen_name] = make_linked_ptr(result);
+
+  BaseScreen* result = CreateScreen(screen);
+  DCHECK(result) << "Can not create screen named " << GetOobeScreenName(screen);
+  screens_[screen] = make_linked_ptr(result);
   return result;
 }
 
-bool ScreenManager::HasScreen(const std::string& screen_name) {
-  return screens_.count(screen_name) > 0;
+bool ScreenManager::HasScreen(OobeScreen screen) {
+  return screens_.count(screen) > 0;
 }
 
 }  // namespace chromeos