Invalid URLs are no longer mangled when reopening the Options window

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 778 matching lines @@
       launchAppWithBundleIdentifier:kKeychainBundleId
                             options:0L
      additionalEventParamDescriptor:nil
                    launchIdentifier:nil];
 }
 
 //-------------------------------------------------------------------------
 // Basics panel
 
 // Sets the home page preferences for kNewTabPageIsHomePage and kHomePage. If a
-// blank string is passed in we revert to using NewTab page as the Home page.
-// When setting the Home Page to NewTab page, we preserve the old value of
-// kHomePage (we don't overwrite it). Note: using SetValue() causes the
-// observers not to fire, which is actually a good thing as we could end up in a
-// state where setting the homepage to an empty url would automatically reset
-// the prefs back to using the NTP, so we'd be never be able to change it.
-- (void)setHomepage:(const std::string&)homepage {
-  if (homepage.empty() || homepage == GetNewTabUIURLString()) {
+// blank or null-host URL is passed in we revert to using NewTab page
+// as the Home page. Note: using SetValue() causes the observers not to fire,
+// which is actually a good thing as we could end up in a state where setting
+// the homepage to an empty url would automatically reset the prefs back to
+// using the NTP, so we'd be never be able to change it.
+- (void)setHomepage:(const GURL&)homepage {
+  if (!homepage.is_valid() || homepage.spec() == GetNewTabUIURLString()) {
     newTabPageIsHomePage_.SetValue(true);
+    if (!homepage.has_host())
+      homepage_.SetValue(std::wstring());
   } else {
     newTabPageIsHomePage_.SetValue(false);
-    homepage_.SetValue(UTF8ToWide(homepage));
+    homepage_.SetValue(UTF8ToWide(homepage.spec()));
   }
 }
 
 // Callback when preferences are changed by someone modifying the prefs backend
 // externally. |prefName| is the name of the pref that has changed. Unlike on
 // Windows, we don't need to use this method for initializing, that's handled by
 // Cocoa Bindings.
 // Handles prefs for the "Basics" panel.
 - (void)basicsPrefChanged:(std::wstring*)prefName {
   if (*prefName == prefs::kRestoreOnStartup) {
@@ skipping 185 matching lines @@
   return value;
 }
 
 // Sets the homepage URL to |urlString| with some fixing up.
 - (void)setHomepageURL:(NSString*)urlString {
   // If the text field contains a valid URL, sync it to prefs. We run it
   // through the fixer upper to allow input like "google.com" to be converted
   // to something valid ("http://google.com").
   std::string unfixedURL = urlString ? base::SysNSStringToUTF8(urlString) :
                                        chrome::kChromeUINewTabURL;
-  std::string fixedURL = URLFixerUpper::FixupURL(unfixedURL, std::string());
-  if (GURL(fixedURL).is_valid())
-    [self setHomepage:fixedURL];
+  [self setHomepage:GURL(URLFixerUpper::FixupURL(unfixedURL, std::string()))];
 }
 
 // Returns whether the home button should be checked based on the preference.
 - (BOOL)showHomeButton {
   return showHomeButton_.GetValue() ? YES : NO;
 }
 
 // Sets the backend pref for whether or not the home button should be displayed
 // based on |value|.
 - (void)setShowHomeButton:(BOOL)value {
@@ skipping 853 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