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

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 57 matching lines @@
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/child_process_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/process_type.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/rect.h"
 
 using content::BrowserThread;
 
@@ skipping 2772 matching lines @@
       proc_data->SetString("version", iterator->version);
       proc_data->SetString("product_name", iterator->product_name);
       proc_data->SetInteger("num_processes", iterator->num_processes);
       proc_data->SetBoolean("is_diagnostics", iterator->is_diagnostics);
 
       // Process type, if this is a child process of Chrome (e.g., 'plugin').
       std::string process_type = "Unknown";
       // The following condition avoids a DCHECK in debug builds when the
       // process type passed to |GetTypeNameInEnglish| is unknown.
       if (iterator->type != content::PROCESS_TYPE_UNKNOWN)
-        process_type = ChildProcessInfo::GetTypeNameInEnglish(iterator->type);
+        process_type = content::GetProcessTypeNameInEnglish(iterator->type);
       proc_data->SetString("child_process_type", process_type);
 
       // Renderer type, if this is a renderer process.
       std::string renderer_type = "Unknown";
       if (iterator->renderer_type !=
           ProcessMemoryInformation::RENDERER_UNKNOWN) {
         renderer_type = ProcessMemoryInformation::GetRendererTypeNameInEnglish(
             iterator->renderer_type);
       }
       proc_data->SetString("renderer_type", renderer_type);
@@ skipping 72 matching lines @@
       if (automation_) {
         AutomationJSONReply(automation_, reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }