Revert 105136 - [chromiumos] Start TPM token initialization re-tries on login

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2011 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/chromeos/options/wifi_config_view.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ skipping 773 matching lines @@
     security_combobox_ = new views::Combobox(new SecurityComboboxModel());
     security_combobox_->set_listener(this);
     layout->AddView(security_combobox_);
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   // Only enumerate certificates in the data model for 802.1X networks.
   if (show_8021x) {
     // Initialize cert_library_ for 802.1X netoworks.
     cert_library_ = chromeos::CrosLibrary::Get()->GetCertLibrary();
-    // Setup a callback if certificates are yet to be loaded,
-    if (!cert_library_->CertificatesLoaded())
-      cert_library_->AddObserver(this);
+    cert_library_->AddObserver(this);
+    cert_library_->RequestCertificates();
 
     // EAP method
     layout->StartRow(0, column_view_set_id);
     layout->AddView(new views::Label(l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD)));
     eap_method_combobox_ = new views::Combobox(new EAPMethodComboboxModel());
     eap_method_combobox_->set_listener(this);
     layout->AddView(eap_method_combobox_);
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
@@ skipping 266 matching lines @@
   // Set focus to a reasonable widget, depending on what we're showing.
   if (ssid_textfield_)
     ssid_textfield_->RequestFocus();
   else if (eap_method_combobox_)
     eap_method_combobox_->RequestFocus();
   else if (passphrase_textfield_ && passphrase_textfield_->IsEnabled())
     passphrase_textfield_->RequestFocus();
 }
 
 }  // namespace chromeos