Split the ProcessType enum into process types that content knows about (which will remain in src\co…

chrome/browser/memory_details_mac.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/memory_details.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 129 matching lines @@
   ProcessInfoSnapshot process_info;
   process_info.Sample(all_pids);
 
   // Handle the other processes first.
   for (size_t index = CHROME_BROWSER + 1; index < MAX_BROWSERS; index++) {
     for (std::vector<base::ProcessId>::const_iterator it =
          pids_by_browser[index].begin();
          it != pids_by_browser[index].end(); ++it) {
       ProcessMemoryInformation info;
       info.pid = *it;
-      info.type = content::PROCESS_TYPE_UNKNOWN;
+      info.process_type = content::PROCESS_TYPE_UNKNOWN;
 
       // Try to get version information. To do this, we need first to get the
       // executable's name (we can only believe |proc_info.command| if it looks
       // like an absolute path). Then we need strip the executable's name back
       // to the bundle's name. And only then can we try to get the version.
       scoped_ptr<FileVersionInfo> version_info;
       ProcessInfoSnapshot::ProcInfoEntry proc_info;
       if (process_info.GetProcInfo(info.pid, &proc_info)) {
         if (proc_info.command.length() > 1 && proc_info.command[0] == '/') {
           base::FilePath bundle_name =
@@ skipping 40 matching lines @@
       base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this));
 }
 
 void MemoryDetails::CollectProcessDataChrome(
     const std::vector<ProcessMemoryInformation>& child_info,
     base::ProcessId pid,
     const ProcessInfoSnapshot& process_info) {
   ProcessMemoryInformation info;
   info.pid = pid;
   if (info.pid == base::GetCurrentProcId())
-    info.type = content::PROCESS_TYPE_BROWSER;
+    info.process_type = content::PROCESS_TYPE_BROWSER;
   else
-    info.type = content::PROCESS_TYPE_UNKNOWN;
+    info.process_type = content::PROCESS_TYPE_UNKNOWN;
 
   chrome::VersionInfo version_info;
   if (version_info.is_valid()) {
     info.product_name = ASCIIToUTF16(version_info.Name());
     info.version = ASCIIToUTF16(version_info.Version());
   } else {
     info.product_name = process_data_[CHROME_BROWSER].name;
     info.version = string16();
   }
 
   // Check if this is one of the child processes whose data we collected
   // on the IO thread, and if so copy over that data.
   for (size_t child = 0; child < child_info.size(); child++) {
     if (child_info[child].pid == info.pid) {
       info.titles = child_info[child].titles;
-      info.type = child_info[child].type;
+      info.process_type = child_info[child].process_type;
       break;
     }
   }
 
   // Memory info.
   process_info.GetCommittedKBytesOfPID(info.pid, &info.committed);
   process_info.GetWorkingSetKBytesOfPID(info.pid, &info.working_set);
 
   // Add the process info to our list.
   process_data_[CHROME_BROWSER].processes.push_back(info);
 }