Options: disallow bad URLs from being entered as startup pages

chrome/browser/ui/webui/options/startup_pages_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/startup_pages_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/ui/webui/settings_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/prefs/pref_service.h"
-#include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_ui.h"
+#include "url/gurl.h"
 
 namespace options {
 
 StartupPagesHandler::StartupPagesHandler() {
 }
 
 StartupPagesHandler::~StartupPagesHandler() {
 }
 
 void StartupPagesHandler::GetLocalizedValues(
@@ skipping 119 matching lines @@
       return;
     }
     startup_custom_pages_table_model_->Remove(selected_index);
   }
 }
 
 void StartupPagesHandler::AddStartupPage(const base::ListValue* args) {
   std::string url_string;
   CHECK(args->GetString(0, &url_string));
 
-  GURL url = url_formatter::FixupURL(url_string, std::string());
-  if (!url.is_valid())
+  GURL url;

[dpapad, 2016/03/31 20:34:08]

Nit: s/url/fixed_url, for consistency with EditStartupPage below.

[Dan Beam, 2016/03/31 22:04:40]

Done.

+  if (!settings_utils::FixupAndValidateStartupPage(url_string, &url))
     return;
 
   int row_count = startup_custom_pages_table_model_->RowCount();
   int index;
   if (!args->GetInteger(1, &index) || index > row_count)
     index = row_count;
 
   startup_custom_pages_table_model_->Add(index, url);
 }
 
 void StartupPagesHandler::EditStartupPage(const base::ListValue* args) {
-  std::string url_string;
-  GURL fixed_url;
+  CHECK_EQ(args->GetSize(), 2U);
   int index;
-  CHECK_EQ(args->GetSize(), 2U);
   CHECK(args->GetInteger(0, &index));
-  CHECK(args->GetString(1, &url_string));
 
   if (index < 0 || index > startup_custom_pages_table_model_->RowCount()) {
     NOTREACHED();
     return;
   }
 
-  fixed_url = url_formatter::FixupURL(url_string, std::string());
-  if (!fixed_url.is_empty()) {
+  std::string url_string;
+  CHECK(args->GetString(1, &url_string));
+
+  GURL fixed_url;
+  if (settings_utils::FixupAndValidateStartupPage(url_string, &fixed_url)) {
     std::vector<GURL> urls = startup_custom_pages_table_model_->GetURLs();
     urls[index] = fixed_url;
     startup_custom_pages_table_model_->SetURLs(urls);
   } else {
     startup_custom_pages_table_model_->Remove(index);
   }
 }
 
 void StartupPagesHandler::DragDropStartupPage(const base::ListValue* args) {
   CHECK_EQ(args->GetSize(), 2U);
@@ skipping 49 matching lines @@
 
 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   base::ListValue suggestions;
   OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);
   web_ui()->CallJavascriptFunction(
       "StartupOverlay.updateAutocompleteSuggestions", suggestions);
 }
 
 }  // namespace options