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

chrome/browser/memory_details_win.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 <psapi.h>
 
 #include "base/bind.h"
 #include "base/file_version_info.h"
@@ skipping 90 matching lines @@
     for (unsigned int index2 = 0; index2 < process_data_.size(); index2++) {
       if (_wcsicmp(process_data_[index2].process_name.c_str(),
                    process_entry.szExeFile) != 0)
         continue;
       if (index2 == IE_BROWSER && is_64bit_process)
         continue;  // Should use IE_64BIT_BROWSER
       // Get Memory Information.
       ProcessMemoryInformation info;
       info.pid = pid;
       if (info.pid == GetCurrentProcessId())
-        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;
 
       scoped_ptr<base::ProcessMetrics> metrics;
       metrics.reset(base::ProcessMetrics::CreateProcessMetrics(process_handle));
       metrics->GetCommittedKBytes(&info.committed);
       metrics->GetWorkingSetKBytes(&info.working_set);
 
       // Get Version Information.
       TCHAR name[MAX_PATH];
       if (index2 == CHROME_BROWSER || index2 == CHROME_NACL_PROCESS) {
         chrome::VersionInfo version_info;
         if (version_info.is_valid())
           info.version = ASCIIToWide(version_info.Version());
         // 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)
             continue;
           info.titles = child_info[child].titles;
-          info.type = child_info[child].type;
+          info.process_type = child_info[child].process_type;
           break;
         }
       } else if (GetModuleFileNameEx(process_handle, NULL, name,
                                      MAX_PATH - 1)) {
         std::wstring str_name(name);
         scoped_ptr<FileVersionInfo> version_info(
             FileVersionInfo::CreateFileVersionInfo(base::FilePath(str_name)));
         if (version_info != NULL) {
           info.version = version_info->product_version();
           info.product_name = version_info->product_name();
         }
       }
 
       // Add the process info to our list.
       if (index2 == CHROME_NACL_PROCESS) {
         // Add NaCl processes to Chrome's list
         process_data_[CHROME_BROWSER].processes.push_back(info);
       } else {
         process_data_[index2].processes.push_back(info);
       }
       break;
     }
   } while (::Process32Next(snapshot, &process_entry));
 
   // Finally return to the browser thread.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this));
 }