Merge 53961 - [Mac] Fix the custom homepages preferences to:...

chrome/browser/cocoa/preferences_window_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 859 matching lines @@
 // Cocoa Bindings.
 // Handles prefs for the "Basics" panel.
 - (void)basicsPrefChanged:(std::wstring*)prefName {
   if (*prefName == prefs::kRestoreOnStartup) {
     const SessionStartupPref startupPref =
         SessionStartupPref::GetStartupPref(prefs_);
     [self setRestoreOnStartupIndex:startupPref.type];
   }
 
   if (*prefName == prefs::kURLsToRestoreOnStartup) {
-    const SessionStartupPref startupPref =
-        SessionStartupPref::GetStartupPref(prefs_);
-    [customPagesSource_ setURLs:startupPref.urls];
+    [customPagesSource_ reloadURLs];
   }
 
   if (*prefName == prefs::kHomePageIsNewTabPage) {
     NSInteger useNewTabPage = newTabPageIsHomePage_.GetValue() ? 0 : 1;
     [self setNewTabPageIsHomePageIndex:useNewTabPage];
   }
   if (*prefName == prefs::kHomePage) {
     NSString* value = base::SysUTF8ToNSString(homepage_.GetValue());
     [self setHomepageURL:value];
   }
@@ skipping 1163 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end