Localize strings, speeds.

chrome/browser/diagnostics/recon_diagnostics.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/recon_diagnostics.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/path_service.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/common/json_value_serializer.h"
+#include "ui/base/text/bytes_formatting.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/installer/util/install_util.h"
 #endif
 
 // Reconnaissance diagnostics. These are the first and most critical
 // diagnostic tests. Here we check for the existence of critical files.
 // TODO(cpu): Define if it makes sense to localize strings.
@@ skipping 211 matching lines @@
     if (path_info_.is_directory) {
       dir_or_file_size = file_util::ComputeDirectorySize(dir_or_file);
     } else {
       file_util::GetFileSize(dir_or_file, &dir_or_file_size);
     }
     if (!dir_or_file_size && !path_info_.is_optional) {
       RecordFailure(ASCIIToUTF16("Cannot obtain size for: ") +
                     dir_or_file.LossyDisplayName());
       return true;
     }
-    DataUnits units = GetByteDisplayUnits(dir_or_file_size);
-    string16 printable_size = FormatBytes(dir_or_file_size, units, true);
+    string16 printable_size = ui::FormatBytes(dir_or_file_size,
+                                              ui::DATA_UNITS_NATURAL,
+                                              true);
 
     if (path_info_.max_size > 0) {
       if (dir_or_file_size > path_info_.max_size) {
         RecordFailure(ASCIIToUTF16("Path contents too large (") +
                       printable_size +
                       ASCIIToUTF16(") for: ") +
                       dir_or_file.LossyDisplayName());
         return true;
       }
     }
@@ skipping 26 matching lines @@
 
   virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
     FilePath data_dir;
     if (!PathService::Get(chrome::DIR_USER_DATA, &data_dir))
       return false;
     int64 disk_space = base::SysInfo::AmountOfFreeDiskSpace(data_dir);
     if (disk_space < 0) {
       RecordFailure(ASCIIToUTF16("Unable to query free space"));
       return true;
     }
-    DataUnits units = GetByteDisplayUnits(disk_space);
-    string16 printable_size = FormatBytes(disk_space, units, true);
+    string16 printable_size = ui::FormatBytes(disk_space,
+                                              ui::DATA_UNITS_NATURAL,
+                                              true);
     if (disk_space < 80 * kOneMeg) {
       RecordFailure(ASCIIToUTF16("Low disk space : ") + printable_size);
       return true;
     }
     RecordSuccess(ASCIIToUTF16("Free space : ") + printable_size);
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DiskSpaceTest);
@@ skipping 102 matching lines @@
   path = path.Append(chrome::kBookmarksFileName);
   return new JSONTest(path, ASCIIToUTF16("BookMarks JSON"), 2 * kOneMeg);
 }
 
 DiagnosticTest* MakeLocalStateTest() {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(chrome::kLocalStateFilename);
   return new JSONTest(path, ASCIIToUTF16("Local State JSON"), 50 * kOneKilo);
 }