webui: Replace wstring with string16 for one variable.

chrome/browser/ui/webui/about_ui.cc

 // Copyright (c) 2012 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/ui/webui/about_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 841 matching lines @@
 
 void AboutMemoryHandler::OnDetailsAvailable() {
   // the root of the JSON hierarchy for about:memory jstemplate
   DictionaryValue root;
   ListValue* browsers = new ListValue();
   root.Set("browsers", browsers);
 
   const std::vector<ProcessData>& browser_processes = processes();
 
   // Aggregate per-process data into browser summary data.
-  std::wstring log_string;
+  string16 log_string;
   for (size_t index = 0; index < browser_processes.size(); index++) {
     if (browser_processes[index].processes.empty())
       continue;
 
     // Sum the information for the processes within this browser.
     ProcessMemoryInformation aggregate;
     ProcessMemoryInformationList::const_iterator iterator;
     iterator = browser_processes[index].processes.begin();
     aggregate.pid = iterator->pid;
     aggregate.version = iterator->version;
@@ skipping 10 matching lines @@
       }
       ++iterator;
     }
     DictionaryValue* browser_data = new DictionaryValue();
     browsers->Append(browser_data);
     browser_data->SetString("name", browser_processes[index].name);
 
     BindProcessMetrics(browser_data, &aggregate);
 
     // We log memory info as we record it.
     if (log_string.length() > 0)

[sky, 2012/12/06 21:05:01]

!empty

-      log_string.append(L", ");
-    log_string.append(UTF16ToWide(browser_processes[index].name));
-    log_string.append(L", ");
-    log_string.append(UTF8ToWide(
-        base::Int64ToString(aggregate.working_set.priv)));
-    log_string.append(L", ");
-    log_string.append(UTF8ToWide(
-        base::Int64ToString(aggregate.working_set.shared)));
-    log_string.append(L", ");
-    log_string.append(UTF8ToWide(
-        base::Int64ToString(aggregate.working_set.shareable)));
+      log_string.append(ASCIIToUTF16(", "));
+    log_string.append(browser_processes[index].name);

[sky, 2012/12/06 21:05:01]

This feels like more code than it needs to be. How about:

log_string += browser_processes[index].name + ASCIIToUTF16(", ") + ...

+    log_string.append(ASCIIToUTF16(", "));
+    log_string.append(base::Int64ToString16(aggregate.working_set.priv));
+    log_string.append(ASCIIToUTF16(", "));
+    log_string.append(base::Int64ToString16(aggregate.working_set.shared));
+    log_string.append(ASCIIToUTF16(", "));
+    log_string.append(base::Int64ToString16(aggregate.working_set.shareable));
   }
   if (log_string.length() > 0)

[sky, 2012/12/06 21:05:01]

!empty

[exxi, 2012/12/06 22:59:15]

Done.

     VLOG(1) << "memory: " << log_string;
 
   // Set the browser & renderer detailed process data.
   DictionaryValue* browser_data = new DictionaryValue();
   root.Set("browzr_data", browser_data);
   ListValue* child_data = new ListValue();
   root.Set("child_data", child_data);
 
   ProcessData process = browser_processes[0];  // Chrome is the first browser.
   root.SetString("current_browser_name", process.name);
@@ skipping 112 matching lines @@
   ThemeSource* theme = new ThemeSource(profile);
   ChromeURLDataManager::AddDataSource(profile, theme);
 #endif
 
   ChromeURLDataManager::DataSource* source =
       new AboutUIHTMLSource(name, profile);
   if (source) {
     ChromeURLDataManager::AddDataSource(profile, source);
   }
 }