Remove 1 static initializer and some unused code.

chrome/browser/diagnostics/diagnostics_main.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/diagnostics/diagnostics_main.h"
 
 #if defined(OS_POSIX)
 #include <stdio.h>
 #include <unistd.h>
 #endif
 
-#include <iostream>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 
   virtual ~SimpleConsole() { }
 
   // Init must be called before using any other method. If it returns
   // false there would be no console output.
   virtual bool Init() = 0;
 
   // Writes a string to the console with the current color.
   virtual bool Write(const std::wstring& text) = 0;
 
-  // Reads a string from the console. Internally it may be limited to 256
-  // characters.
-  virtual bool Read(std::wstring* txt) = 0;
+  // Called when the program is about to exit.
+  virtual void OnQuit() = 0;
 
   // Sets the foreground and background color.
   virtual bool SetColor(Color color) = 0;
 
   // Create an appropriate SimpleConsole instance.  May return NULL if there is
   // no implementation for the current platform.
   static SimpleConsole* Create();
 };
 
 #if defined(OS_WIN)
@@ skipping 16 matching lines @@
     return SetIOHandles();
   }
 
   virtual bool Write(const std::wstring& txt) {
     DWORD sz = txt.size();
     return (TRUE == ::WriteConsoleW(std_out_, txt.c_str(), sz, &sz, NULL));
   }
 
   // Reads a string from the console. Internally it is limited to 256
   // characters.
-  virtual bool Read(std::wstring* txt) {
+  virtual void OnQuit() {
+    // Block here so the user can see the results.
+    SetColor(SimpleConsole::DEFAULT);
+    Write(L"Press [enter] to continue\n");
     wchar_t buf[256];
-    DWORD read = sizeof(buf) - sizeof(buf[0]);
-    if (!::ReadConsoleW(std_in_, buf, read, &read, NULL))
-      return false;
-    // Note that |read| is in bytes.
-    txt->assign(buf, read/2);
-    return true;
+    DWORD read = arraysize(buf);
+    ::ReadConsoleW(std_in_, buf, read, &read, NULL);
   }
 
   // Sets the foreground and background color.
   virtual bool SetColor(Color color) {
     uint16 color_combo =
         FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_INTENSITY;
     switch (color) {
       case RED:
         color_combo = FOREGROUND_RED|FOREGROUND_INTENSITY;
         break;
@@ skipping 39 matching lines @@
     // color, but in practice this is unlikely to be an issue.
     use_color_ = isatty(STDOUT_FILENO);
     return true;
   }
 
   virtual bool Write(const std::wstring& text) {
     printf("%s", base::SysWideToNativeMB(text).c_str());
     return true;
   }
 
-  virtual bool Read(std::wstring* txt) {
-    std::string input;
-    if (!std::getline(std::cin, input)) {
-      std::cin.clear();
-      return false;
-    }
-    *txt = UTF8ToWide(input);
-    return true;
+  virtual void OnQuit() {
+    // The "press enter to continue" prompt isn't very unixy, so only do that on
+    // Windows.
   }
 
   virtual bool SetColor(Color color) {
     if (!use_color_)
       return false;
 
     const char* code = "\033[m";
     switch (color) {
       case RED:
         code = "\033[1;31m";
@@ skipping 181 matching lines @@
   chrome::RegisterPathProvider();
 
   TestWriter writer(console);
   DiagnosticsModel* model = MakeDiagnosticsModel(command_line);
   TestController controller(&writer);
 
   // Run all the diagnostic tests.
   controller.Run(model);
   delete model;
 
-  // The "press enter to continue" prompt isn't very unixy, so only do that on
-  // Windows.
-#if defined(OS_WIN)
-  // Block here so the user can see the results.
-  writer.WriteInfoText(L"Press [enter] to continue\n");
-  std::wstring txt;
-  console->Read(&txt);
-#endif
   delete console;
   return 0;
 }