Update RestoreOnStartupPolicyHandler to translate to the correct preferences

chrome/browser/prefs/session_startup_pref.cc

 // 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.
 
 #include "chrome/browser/prefs/session_startup_pref.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/window_restore_utils.h"
 #endif
 
 using protector::ProtectedPrefsWatcher;
 using protector::ProtectorServiceFactory;
 
 namespace {
 
-// For historical reasons the enum and value registered in the prefs don't line
-// up. These are the values registered in prefs.
-const int kPrefValueHomePage = 0;  // Deprecated
-const int kPrefValueLast = 1;
-const int kPrefValueURLs = 4;
-const int kPrefValueNewTab = 5;
-
 // Converts a SessionStartupPref::Type to an integer written to prefs.
 int TypeToPrefValue(SessionStartupPref::Type type) {
   switch (type) {
-    case SessionStartupPref::LAST:     return kPrefValueLast;
-    case SessionStartupPref::URLS:     return kPrefValueURLs;
-    default:                           return kPrefValueNewTab;
+    case SessionStartupPref::LAST: return SessionStartupPref::kPrefValueLast;
+    case SessionStartupPref::URLS: return SessionStartupPref::kPrefValueURLs;
+    default:                       return SessionStartupPref::kPrefValueNewTab;
   }
 }
 
 void SetNewURLList(PrefService* prefs) {
   ListValue new_url_pref_list;
   StringValue* home_page = new StringValue(prefs->GetString(prefs::kHomePage));
   new_url_pref_list.Append(home_page);
   prefs->Set(prefs::kURLsToRestoreOnStartup, new_url_pref_list);
 }
 
@@ skipping 156 matching lines @@
   CHECK(prefs_watcher->GetBackupForPref(
             prefs::kURLsToRestoreOnStartup)->GetAsList(&url_list));
   URLListToPref(url_list, &backup_pref);
 
   return backup_pref;
 }
 
 SessionStartupPref::SessionStartupPref(Type type) : type(type) {}
 
 SessionStartupPref::~SessionStartupPref() {}