Invalid URLs are no longer mangled when reopening the Options window

chrome/browser/views/options/general_page_view.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/views/options/general_page_view.h"
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
@@ skipping 214 matching lines @@
     }
   } else if (sender == startup_add_custom_page_button_) {
     AddURLToStartupURLs();
   } else if (sender == startup_remove_custom_page_button_) {
     RemoveURLsFromStartupURLs();
   } else if (sender == startup_use_current_page_button_) {
     SetStartupURLToCurrentPage();
   } else if (sender == homepage_use_newtab_radio_) {
     UserMetricsRecordAction(UserMetricsAction("Options_Homepage_UseNewTab"),
                             profile()->GetPrefs());
-    SetHomepage(GetNewTabUIURLString());
+    SetHomepage(GURL());
     EnableHomepageURLField(false);
   } else if (sender == homepage_use_url_radio_) {
     UserMetricsRecordAction(UserMetricsAction("Options_Homepage_UseURL"),
                             profile()->GetPrefs());
-    SetHomepage(homepage_use_url_textfield_->text());
+    SetHomepage(GURL(homepage_use_url_textfield_->text()));
     EnableHomepageURLField(true);
   } else if (sender == homepage_show_home_button_checkbox_) {
     bool show_button = homepage_show_home_button_checkbox_->checked();
     if (show_button) {
       UserMetricsRecordAction(
                         UserMetricsAction("Options_Homepage_ShowHomeButton"),
                         profile()->GetPrefs());
     } else {
       UserMetricsRecordAction(
                         UserMetricsAction("Options_Homepage_HideHomeButton"),
@@ skipping 27 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView, views::Textfield::Controller implementation:
 
 void GeneralPageView::ContentsChanged(views::Textfield* sender,
                                       const std::wstring& new_contents) {
   if (sender == homepage_use_url_textfield_) {
     // 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 url_string = URLFixerUpper::FixupURL(
-        UTF16ToUTF8(homepage_use_url_textfield_->text()), std::string());
-    if (GURL(url_string).is_valid())
-      SetHomepage(UTF8ToWide(url_string));
+    // to something valid ("http://google.com"). If the field contains an
+    // empty or null-host URL, a blank homepage is synced to prefs.
+    SetHomepage(GURL(URLFixerUpper::FixupURL(
+        UTF16ToUTF8(homepage_use_url_textfield_->text()), std::string())));
   }
 }
 
 bool GeneralPageView::HandleKeystroke(views::Textfield* sender,
                                       const views::Textfield::Keystroke&) {
   return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView, OptionsPageView implementation:
@@ skipping 435 matching lines @@
   if (index == -1)
     index = startup_custom_pages_table_model_->RowCount();
   else
     index++;
   startup_custom_pages_table_model_->Add(index, url);
   startup_custom_pages_table_->Select(index);
 
   SaveStartupPref();
 }
 
-void GeneralPageView::SetHomepage(const std::wstring& homepage) {
-  if (homepage.empty() || homepage == GetNewTabUIURLString()) {
+void GeneralPageView::SetHomepage(const GURL& homepage) {
+  if (!homepage.is_valid() ||
+      UTF8ToWide(homepage.spec()) == GetNewTabUIURLString()) {
     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(homepage);
+    homepage_.SetValue(UTF8ToWide(homepage.spec()));
   }
 }
 
 void GeneralPageView::OnSelectionChanged() {
   startup_remove_custom_page_button_->SetEnabled(
       startup_custom_pages_table_->SelectedRowCount() > 0);
 }
 
 void GeneralPageView::EnableHomepageURLField(bool enabled) {
   if (enabled) {
     homepage_use_url_textfield_->SetEnabled(true);
     homepage_use_url_textfield_->SetReadOnly(false);
   } else {
     homepage_use_url_textfield_->SetEnabled(false);
     homepage_use_url_textfield_->SetReadOnly(true);
   }
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->selected_item();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }