Remove all uses of EmptyString16(), EmptyWString(), and EmptyGURL(), and thei...

chrome/browser/views/options/general_page_view.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
@@ skipping 739 matching lines @@
   button_stack_layout->AddView(startup_remove_custom_page_button_,
                                1, 1, GridLayout::FILL, GridLayout::CENTER);
   button_stack_layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(startup_use_current_page_button_,
                                1, 1, GridLayout::FILL, GridLayout::CENTER);
   layout->AddView(button_stack);
 
   startup_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_STARTUP_GROUP_NAME),
-      EmptyWString(), true);
+      std::wstring(), true);
 }
 
 void GeneralPageView::InitHomepageGroup() {
   homepage_use_newtab_radio_ = new views::RadioButton(
       l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_USE_NEWTAB),
       kHomePageRadioGroup);
   homepage_use_newtab_radio_->set_listener(this);
   homepage_use_newtab_radio_->SetMultiLine(true);
   homepage_use_url_radio_ = new views::RadioButton(
       l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_USE_URL),
@@ skipping 31 matching lines @@
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(homepage_use_url_radio_);
   layout->AddView(homepage_use_url_textfield_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(homepage_show_home_button_checkbox_);
 
   homepage_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_GROUP_NAME),
-      EmptyWString(), true);
+      std::wstring(), true);
 }
 
 
 void GeneralPageView::InitDefaultSearchGroup() {
   default_search_engines_model_.reset(new SearchEngineListModel(profile()));
   default_search_engine_combobox_ =
       new views::Combobox(default_search_engines_model_.get());
   default_search_engines_model_->SetCombobox(default_search_engine_combobox_);
   default_search_engine_combobox_->set_listener(this);
 
@@ skipping 15 matching lines @@
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(default_search_engine_combobox_);
   layout->AddView(default_search_manage_engines_button_);
 
   default_search_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME),
-      EmptyWString(), true);
+      std::wstring(), true);
 }
 
 void GeneralPageView::InitDefaultBrowserGroup() {
   default_browser_status_label_ = new views::Label;
   default_browser_status_label_->SetMultiLine(true);
   default_browser_status_label_->SetHorizontalAlignment(
       views::Label::ALIGN_LEFT);
   default_browser_use_as_default_button_ = new views::NativeButton(
       this,
       l10n_util::GetStringF(IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT,
@@ skipping 12 matching lines @@
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(default_browser_status_label_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(default_browser_use_as_default_button_);
 
   default_browser_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME),
-      EmptyWString(), false);
+      std::wstring(), false);
 
   default_browser_worker_->StartCheckDefaultBrowser();
 }
 
 void GeneralPageView::SaveStartupPref() {
   SessionStartupPref pref;
 
   if (startup_last_session_radio_->checked()) {
     pref.type = SessionStartupPref::LAST;
   } else if (startup_custom_radio_->checked()) {
@@ skipping 99 matching lines @@
     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));
 }