Porting refactoring changes:...

chrome/browser/metrics_log.cc

 // Copyright (c) 2006-2008 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/metrics_log.h"
 
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/md5.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/common/env_util.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/base64.h"
 
 #define OPEN_ELEMENT_FOR_SCOPE(name) ScopedElement scoped_element(this, name)
 
 // libxml take xmlChar*, which is unsigned char*
 inline const unsigned char* UnsignedChar(const char* input) {
@@ skipping 414 matching lines @@
   WriteIntAttribute("buildid", 0);  // means that we're using appversion instead
   WriteAttribute("appversion", GetVersionString());
   EndElement();
 
   WritePluginList(plugin_list);
 
   WriteStabilityElement();
 
   {
     OPEN_ELEMENT_FOR_SCOPE("cpu");
-    WriteAttribute("arch", env_util::GetCPUArchitecture());
+    WriteAttribute("arch", base::SysInfo::CPUArchitecture());
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("security");
     WriteIntAttribute("rendereronsboxdesktop",
                       pref->GetInteger(prefs::kSecurityRendererOnSboxDesktop));
     pref->SetInteger(prefs::kSecurityRendererOnSboxDesktop, 0);
 
     WriteIntAttribute("rendererondefaultdesktop",
         pref->GetInteger(prefs::kSecurityRendererOnDefaultDesktop));
     pref->SetInteger(prefs::kSecurityRendererOnDefaultDesktop, 0);
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("memory");
     WriteIntAttribute("mb", base::SysInfo::AmountOfPhysicalMemoryMB());
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("os");
     WriteAttribute("name",
-                   env_util::GetOperatingSystemName());
+                   base::SysInfo::OperatingSystemName());
     WriteAttribute("version",
-                   env_util::GetOperatingSystemVersion());
+                   base::SysInfo::OperatingSystemVersion());
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("display");
     int width = 0;
     int height = 0;
-    env_util::GetPrimaryDisplayDimensions(&width, &height);
+    base::SysInfo::GetPrimaryDisplayDimensions(&width, &height);
     WriteIntAttribute("xsize", width);
     WriteIntAttribute("ysize", height);
-    WriteIntAttribute("screens", env_util::GetDisplayCount());
+    WriteIntAttribute("screens", base::SysInfo::DisplayCount());
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("bookmarks");
     int num_bookmarks_on_bookmark_bar =
         pref->GetInteger(prefs::kNumBookmarksOnBookmarkBar);
     int num_folders_on_bookmark_bar =
         pref->GetInteger(prefs::kNumFoldersOnBookmarkBar);
     int num_bookmarks_in_other_bookmarks_folder =
         pref->GetInteger(prefs::kNumBookmarksInOtherBookmarkFolder);
@@ skipping 143 matching lines @@
   for (size_t i = 0; i < histogram.bucket_count(); i++) {
     if (snapshot.counts(i)) {
       OPEN_ELEMENT_FOR_SCOPE("histogrambucket");
       WriteIntAttribute("min", histogram.ranges(i));
       WriteIntAttribute("max", histogram.ranges(i + 1));
       WriteIntAttribute("count", snapshot.counts(i));
     }
   }
 }