chromeos: Stop leaking combobox models in VPNConfigView dialog.

chrome/browser/chromeos/options/vpn_config_view.h

Index: chrome/browser/chromeos/options/vpn_config_view.h
diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h
index 39e121d5612a2d0ee8f974752ad078286d2e7640..509e9313a39899e6f09e115be2ddf4dffa563365 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.h
+++ b/chrome/browser/chromeos/options/vpn_config_view.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
@@ -18,6 +19,12 @@
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/view.h"
 
+namespace internal {

[tfarina, 2012/04/11 22:48:27]

I put this outside of chromeos namespace intentionally.
Otherwise, I get errors like:

/usr/local/gold/bin/ld: error:
obj/chrome/libbrowser.a(obj/chrome/browser/chromeos/options/browser.wifi_config_view.o):
multiple definition of
'chromeos::internal::ServerCACertComboboxModel::ServerCACertComboboxModel(chromeos::CertLibrary*)'

[stevenjb, 2012/04/12 17:46:28]

We shouldn't use 'chromeos' as the differentiator between these and the classes
in wifi_config_view. We should rename this one VpnServerCACertComboboxModel.

+class ProviderTypeComboboxModel;
+class ServerCACertComboboxModel;
+class UserCertComboboxModel;
+}
+
 namespace views {
 class Label;
 }
@@ -134,13 +141,17 @@ class VPNConfigView : public ChildNetworkConfigView,
   views::Textfield* server_textfield_;
   views::Label* service_text_;
   views::Textfield* service_textfield_;
+  scoped_ptr<internal::ProviderTypeComboboxModel> provider_type_combobox_model_;
   views::Combobox* provider_type_combobox_;
   views::Label* provider_type_text_label_;
   views::Label* psk_passphrase_label_;
   PassphraseTextfield* psk_passphrase_textfield_;
   views::Label* user_cert_label_;
+  scoped_ptr<internal::UserCertComboboxModel> user_cert_combobox_model_;
   views::Combobox* user_cert_combobox_;
   views::Label* server_ca_cert_label_;
+  scoped_ptr<internal::ServerCACertComboboxModel>
+      server_ca_cert_combobox_model_;
   views::Combobox* server_ca_cert_combobox_;
   views::Textfield* username_textfield_;
   PassphraseTextfield* user_passphrase_textfield_;