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

chrome/browser/chromeos/options/vpn_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/vpn_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/login/user_manager.h"
@@ skipping 352 matching lines @@
     return cert_library_->GetUserCertificates().GetPkcs11IdAt(selected);
   }
 }
 
 void VPNConfigView::Init(VirtualNetwork* vpn) {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   // VPN may require certificates, so always set the library and observe.
   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();
 
   int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   // Label.
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kRelatedControlSmallHorizontalSpacing);
   // Textfield, combobox.
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0,
@@ skipping 322 matching lines @@
     return std::string();
   std::string untrimmed = UTF16ToUTF8(textfield->text());
   if (!trim_whitespace)
     return untrimmed;
   std::string result;
   TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace chromeos