Remove migration of obsolete value for "session.restore_on_startup".

chrome/browser/sessions/restore_on_startup_policy_handler.cc

 // Copyright 2013 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/sessions/restore_on_startup_policy_handler.h"
 
 #include "base/prefs/pref_value_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ skipping 14 matching lines @@
 
 void RestoreOnStartupPolicyHandler::ApplyPolicySettings(
     const PolicyMap& policies,
     PrefValueMap* prefs) {
   const base::Value* restore_on_startup_value =
       policies.GetValue(policy_name());
   if (restore_on_startup_value) {
     int restore_on_startup;
     if (!restore_on_startup_value->GetAsInteger(&restore_on_startup))
       return;
-
-    if (restore_on_startup == SessionStartupPref::kPrefValueHomePage)
-      ApplyPolicySettingsFromHomePage(policies, prefs);
-    else
-      prefs->SetInteger(prefs::kRestoreOnStartup, restore_on_startup);
+    prefs->SetInteger(prefs::kRestoreOnStartup, restore_on_startup);
   }
 }
 
-void RestoreOnStartupPolicyHandler::ApplyPolicySettingsFromHomePage(
-    const PolicyMap& policies,
-    PrefValueMap* prefs) {
-  const base::Value* homepage_is_new_tab_page_value =
-      policies.GetValue(key::kHomepageIsNewTabPage);
-  if (!homepage_is_new_tab_page_value) {
-    // The policy is enforcing 'open the homepage on startup' but not
-    // enforcing what the homepage should be. Don't set any prefs.
-    return;
-  }
-
-  bool homepage_is_new_tab_page;
-  if (!homepage_is_new_tab_page_value->GetAsBoolean(&homepage_is_new_tab_page))
-    return;
-
-  if (homepage_is_new_tab_page) {
-    prefs->SetInteger(prefs::kRestoreOnStartup,
-                      SessionStartupPref::kPrefValueNewTab);
-  } else {
-    const base::Value* homepage_value =
-        policies.GetValue(key::kHomepageLocation);
-    if (!homepage_value || !homepage_value->IsType(base::Value::TYPE_STRING)) {
-      // The policy is enforcing 'open the homepage on startup' but not
-      // enforcing what the homepage should be. Don't set any prefs.
-      return;
-    }
-    scoped_ptr<base::ListValue> url_list(new base::ListValue());
-    url_list->Append(homepage_value->CreateDeepCopy());
-    prefs->SetInteger(prefs::kRestoreOnStartup,
-                      SessionStartupPref::kPrefValueURLs);
-    prefs->SetValue(prefs::kURLsToRestoreOnStartup, url_list.Pass());
-  }
-}
-
 bool RestoreOnStartupPolicyHandler::CheckPolicySettings(
     const PolicyMap& policies,
     PolicyErrorMap* errors) {
   if (!TypeCheckingPolicyHandler::CheckPolicySettings(policies, errors))
     return false;
 
   const base::Value* restore_policy = policies.GetValue(key::kRestoreOnStartup);
 
   if (restore_policy) {
     int restore_value;
     CHECK(restore_policy->GetAsInteger(&restore_value));  // Passed type check.
     switch (restore_value) {
-      case SessionStartupPref::kPrefValueHomePage:
+      case 0 /* kPrefValueHomePage */:

[gab, 2015/12/03 15:28:49]

case 0:  // Deprecated kPrefValueHomePage.

(i.e. specifically mention that the constant is deprecated and prefer // after :
to /* */

[sdefresne, 2015/12/03 15:34:13]

Done.

         errors->AddError(policy_name(), IDS_POLICY_VALUE_DEPRECATED);
         break;
       case SessionStartupPref::kPrefValueLast: {
         // If the "restore last session" policy is set, session cookies are
         // treated as permanent cookies and site data needed to restore the
         // session is not cleared so we have to warn the user in that case.
         const base::Value* cookies_policy =
             policies.GetValue(key::kCookiesSessionOnlyForUrls);
         const base::ListValue* cookies_value;
         if (cookies_policy && cookies_policy->GetAsList(&cookies_value) &&
@@ skipping 21 matching lines @@
       default:
         errors->AddError(policy_name(),
                          IDS_POLICY_OUT_OF_RANGE_ERROR,
                          base::IntToString(restore_value));
     }
   }
   return true;
 }
 
 }  // namespace policy