Addressed or cleaned-up a number of TODOs.

chrome/browser/ui/views/stubs_aura.cc

Index: chrome/browser/ui/views/stubs_aura.cc
diff --git a/chrome/browser/ui/views/stubs_aura.cc b/chrome/browser/ui/views/stubs_aura.cc
index 037617f974d5670fa9c61aed0335a381eb67b572..c9f690d4dfc85092ba2eec64763114d26a65b508 100644
--- a/chrome/browser/ui/views/stubs_aura.cc
+++ b/chrome/browser/ui/views/stubs_aura.cc
@@ -34,13 +34,9 @@ namespace views {
 class Widget;
 }
 
-#if !defined(OS_WIN)
-class EditSearchEngineControllerDelegate;
-class TemplateURL;
-#endif
-
 namespace browser {
 
+#if defined(OS_WIN)
 void ShowSSLClientCertificateSelector(

[sky, 2011/11/11 16:50:07]

Can we use the one in
chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc ?

[Emmanuel Saint-loubert-Bié, 2011/11/11 17:35:42]

Actually this is what we are doing now with this CL (in the Linux case). 
I cannot really test the Windows case at the moment. So I wanted to leave that
unchanged for Windows.

     TabContentsWrapper* parent,
     net::SSLCertRequestInfo* cert_request_info,
@@ -48,6 +44,7 @@ void ShowSSLClientCertificateSelector(
   // TODO(beng):
   NOTIMPLEMENTED();
 }
+#endif
 
 void ShowAboutIPCDialog() {
   // TODO(beng):
@@ -66,15 +63,6 @@ crypto::CryptoModuleBlockingPasswordDelegate*
 #endif
 
 #if !defined(OS_WIN)
-void EditSearchEngine(
-    gfx::NativeWindow,
-    const TemplateURL*,
-    EditSearchEngineControllerDelegate*,
-    Profile*) {
-  // TODO(saintlou):
-  NOTIMPLEMENTED();
-}
-
 void ShowCryptoModulePasswordDialog(
     const std::string& module_name,
     bool retry,