Invalid URLs are no longer mangled when reopening the Options window

chrome/browser/gtk/options/general_page_gtk.cc

 // 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.
 
 #include "chrome/browser/gtk/options/general_page_gtk.h"
 
 #include <set>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 610 matching lines @@
     NOTREACHED();
 }
 
 void GeneralPageGtk::EnableDefaultSearchEngineComboBox(bool enable) {
   gtk_widget_set_sensitive(default_search_engine_combobox_, enable);
 }
 
 void GeneralPageGtk::SetHomepage(const GURL& homepage) {
   if (!homepage.is_valid() || homepage.spec() == chrome::kChromeUINewTabURL) {
     new_tab_page_is_home_page_.SetValue(true);
+    if (!homepage.has_host())
+      homepage_.SetValue(std::wstring());
   } else {
     new_tab_page_is_home_page_.SetValue(false);
     homepage_.SetValue(UTF8ToWide(homepage.spec()));
   }
 }
 
 void GeneralPageGtk::SetHomepageFromEntry() {
   GURL url(URLFixerUpper::FixupURL(
       gtk_entry_get_text(GTK_ENTRY(homepage_use_url_entry_)), ""));
   SetHomepage(url);
@@ skipping 28 matching lines @@
   if (color) {
     char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
                                            color, text.c_str());
     gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
     g_free(markup);
   }
 
   gtk_widget_set_sensitive(default_browser_use_as_default_button_,
                            state == ShellIntegration::STATE_NOT_DEFAULT);
 }