Move GetProcessTypeNameInEnglish beside the ProcessType enum where it belongs. This also helps re...

chrome/browser/metrics/tracking_synchronizer.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/metrics/tracking_synchronizer.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/ui/webui/tracing_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/render_messages.h"
-#include "content/common/child_process_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/common/process_type.h"
 
 using base::TimeTicks;
 using content::BrowserThread;
 
 namespace chrome_browser_metrics {
 
 // Negative numbers are never used as sequence numbers.  We explicitly pick a
 // negative number that is "so negative" that even when we add one (as is done
 // when we generated the next sequence number) that it will still be negative.
 // We have code that handles wrapping around on an overflow into negative
@@ skipping 118 matching lines @@
   TrackingSynchronizer* current_synchronizer = CurrentSynchronizer();
   if (current_synchronizer == NULL)
     return;
 
   base::Value* value =
       base::JSONReader().JsonToValue(tracking_data, false, true);
   DCHECK(value->GetType() == base::Value::TYPE_DICTIONARY);
   base::DictionaryValue* dictionary_value =
       static_cast<DictionaryValue*>(value);
   dictionary_value->SetString(
-      "process_type", ChildProcessInfo::GetTypeNameInEnglish(process_type));
+      "process_type", content::GetProcessTypeNameInEnglish(process_type));
 
   current_synchronizer->DecrementPendingProcessesAndSendData(
       sequence_number, dictionary_value);
 }
 
 int TrackingSynchronizer::RegisterAndNotifyAllProcesses(
     const base::WeakPtr<ProfilerUI>& callback_object) {
   // To iterate over all processes, or to send messages to the hosts, we need
   // to be on the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 19 matching lines @@
     ++request->processes_pending_;
     if (!render_process_host->Send(
         new ChromeViewMsg_GetRendererTrackedData(sequence_number))) {
       DecrementPendingProcesses(sequence_number);
     }
   }
 
   // Get the ThreadData for the browser process and send it back.
   base::DictionaryValue* value = tracked_objects::ThreadData::ToValue();
   const std::string process_type =
-      ChildProcessInfo::GetTypeNameInEnglish(content::PROCESS_TYPE_BROWSER);
+      content::GetProcessTypeNameInEnglish(content::PROCESS_TYPE_BROWSER);
   value->SetString("process_type", process_type);
   value->SetInteger("process_id", base::GetCurrentProcId());
   DCHECK_GT(request->processes_pending_, 0);
   DecrementPendingProcessesAndSendData(sequence_number, value);
 
   return sequence_number;
 }
 
 void TrackingSynchronizer::DecrementPendingProcessesAndSendData(
     int sequence_number,
@@ skipping 57 matching lines @@
   // Watch out for wrapping to a negative number.
   if (last_used_sequence_number_ < 0)
     last_used_sequence_number_ = 1;
   return last_used_sequence_number_;
 }
 
 // static
 TrackingSynchronizer* TrackingSynchronizer::tracking_synchronizer_ = NULL;
 
 }  // namespace chrome_browser_metrics