Remove RenderProcessHost::is_extension_process

chrome/app/chrome_main.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 "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/profiling.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/chrome_content_plugin_client.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "content/app/content_main.h"
 #include "content/app/content_main_delegate.h"
 #include "content/browser/renderer_host/render_process_host.h"
-#include "content/renderer/renderer_main.h"
 #include "content/common/content_client.h"
 #include "content/common/content_counters.h"
 #include "content/common/content_paths.h"
 #include "content/common/content_switches.h"
 #include "media/base/media.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include <algorithm>
@@ skipping 183 matching lines @@
     score = kMiscScore;
 #ifndef DISABLE_NACL
   } else if (process_type == switches::kNaClLoaderProcess) {
     score = kPluginScore;
 #endif
   } else if (process_type == switches::kZygoteProcess ||
              process_type.empty()) {
     // For zygotes and unlabeled process types, we want to still make
     // them killable by the OOM killer.
     score = kZygoteScore;
-  } else if (process_type == switches::kExtensionProcess ||
-             process_type == switches::kRendererProcess) {
-    LOG(WARNING) << "process type '" << process_type << "' "
+  } else if (process_type == switches::kRendererProcess) {
+    LOG(WARNING) << "process type 'renderer' "
                  << "should be created through the zygote.";
-    // When debugging, these process types can end up being run
-    // directly, but this isn't the typical path for assigning the OOM
-    // score for them.  Still, we want to assign a score that is
-    // somewhat representative for debugging.
+    // When debugging, this process type can end up being run directly, but
+    // this isn't the typical path for assigning the OOM score for it.  Still,
+    // we want to assign a score that is somewhat representative for debugging.
     score = kRendererScore;
   } else {
     NOTREACHED() << "Unknown process type";
   }
   if (score > -1)
     base::AdjustOOMScore(base::GetCurrentProcId(), score);
 }
 #endif  // defined(OS_LINUX)
 
 // Enable the heap profiler if the appropriate command-line switch is
@@ skipping 11 matching lines @@
       &g_chrome_content_renderer_client.Get());
 }
 
 void InitializeChromeContentClient(const std::string& process_type) {
   if (process_type.empty()) {
     content::GetContentClient()->set_browser(
         &g_chrome_content_browser_client.Get());
   } else if (process_type == switches::kPluginProcess) {
     content::GetContentClient()->set_plugin(
         &g_chrome_content_plugin_client.Get());
-  } else if (process_type == switches::kRendererProcess ||
-             process_type == switches::kExtensionProcess) {
+  } else if (process_type == switches::kRendererProcess) {
     InitializeChromeContentRendererClient();
   } else if (process_type == switches::kUtilityProcess) {
     content::GetContentClient()->set_utility(
         &g_chrome_content_utility_client.Get());
   }
 }
 
 // Returns true if this subprocess type needs the ResourceBundle initialized
 // and resources loaded.
 bool SubprocessNeedsResourceBundle(const std::string& process_type) {
   return
 #if defined(OS_WIN) || defined(OS_MACOSX)
       // Windows needs resources for the default/null plugin.
       // Mac needs them for the plugin process name.
       process_type == switches::kPluginProcess ||
 #endif
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
       // The zygote process opens the resources for the renderers.
       process_type == switches::kZygoteProcess ||
 #endif
 #if defined(OS_MACOSX)
       // Mac needs them to for scrollbar related images.
       process_type == switches::kWorkerProcess ||
 #endif
       process_type == switches::kRendererProcess ||
-      process_type == switches::kExtensionProcess ||
       process_type == switches::kUtilityProcess;
 }
 
 #if defined(OS_MACOSX)
 // Update the name shown in Activity Monitor so users are less likely to ask
 // why Chrome has so many processes.
-void SetMacProcessName(const std::string& process_type) {
+void SetMacProcessName(const CommandLine& command_line) {
+  std::string process_type =
+      command_line.GetSwitchValueASCII(switches::kProcessType);
   // Don't worry about the browser process, its gets the stock name.
   int name_id = 0;
-  if (process_type == switches::kRendererProcess) {
+  if (command_line.HasSwitch(switches::kExtensionProcess)) {
+    name_id = IDS_WORKER_APP_NAME;
+  } else if (process_type == switches::kRendererProcess) {
     name_id = IDS_RENDERER_APP_NAME;
   } else if (process_type == switches::kPluginProcess ||
              process_type == switches::kPpapiPluginProcess) {
     name_id = IDS_PLUGIN_APP_NAME;
-  } else if (process_type == switches::kExtensionProcess) {
-    name_id = IDS_WORKER_APP_NAME;
   } else if (process_type == switches::kUtilityProcess) {
     name_id = IDS_UTILITY_APP_NAME;
   }
   if (name_id) {
     NSString* app_name = l10n_util::GetNSString(name_id);
     base::mac::SetProcessName(base::mac::NSToCFCast(app_name));
   }
 }
 
 #endif  // defined(OS_MACOSX)
@@ skipping 274 matching lines @@
       const std::string locale =
           command_line.GetSwitchValueASCII(switches::kLang);
       const std::string loaded_locale =
           ResourceBundle::InitSharedInstance(locale);
       CHECK(!loaded_locale.empty()) << "Locale could not be found for " <<
           locale;
 
 #if defined(OS_MACOSX)
       // Update the process name (need resources to get the strings, so
       // only do this when ResourcesBundle has been initialized).
-      SetMacProcessName(process_type);
+      SetMacProcessName(command_line);
 #endif  // defined(OS_MACOSX)
     }
 
 #if defined(USE_LINUX_BREAKPAD)
     // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain
     // sets this up for the browser process in a different manner. Zygotes
     // need to call InitCrashReporter() in RunZygote().
     if (!process_type.empty() && process_type != switches::kZygoteProcess)
       InitCrashReporter();
 #endif
@@ skipping 14 matching lines @@
     // AdjustLinuxOOMScore function too.
 #if defined(OS_LINUX)
     AdjustLinuxOOMScore(process_type);
 #endif
   }
 
   virtual int RunProcess(
       const std::string& process_type,
       const MainFunctionParams& main_function_params) OVERRIDE {
     static const MainFunction kMainFunctions[] = {
-      // An extension process is just a renderer process. We use a different
-      // command line argument to differentiate crash reports.
-      { switches::kExtensionProcess,   RendererMain },
       { switches::kServiceProcess,     ServiceProcessMain },
 #if defined(OS_MACOSX)
       { switches::kRelauncherProcess,
             mac_relauncher::internal::RelauncherMain },
 #endif
 #if !defined(DISABLE_NACL)
       { switches::kNaClLoaderProcess, NaClMain },
 #endif  // DISABLE_NACL
     };
 
     for (size_t i = 0; i < arraysize(kMainFunctions); ++i) {
       if (process_type == kMainFunctions[i].name)
         return kMainFunctions[i].function(main_function_params);
     }
 
     NOTREACHED() << "Unknown process type: " << process_type;
     return 1;
   }
 
   virtual void ProcessExiting(const std::string& process_type) OVERRIDE {
     if (SubprocessNeedsResourceBundle(process_type))
       ResourceBundle::CleanupSharedInstance();
 
     logging::CleanupChromeLogging();
   }
 
 #if defined(OS_MACOSX)
   virtual bool ProcessRegistersWithSystemProcess(
       const std::string& process_type) OVERRIDE {
-    return process_type == switches::kNaClLoaderProcess ||
-           process_type == switches::kExtensionProcess;
+    return process_type == switches::kNaClLoaderProcess;
   }
 
   virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE {
     return process_type != switches::kRelauncherProcess &&
            process_type != switches::kServiceProcess;
   }
 
   virtual bool DelaySandboxInitialization(
       const std::string& process_type) OVERRIDE {
-    // Extensions are really renderers.
     // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox().
     // No sandbox needed for relauncher.
-    return process_type == switches::kExtensionProcess ||
-           process_type == switches::kNaClLoaderProcess ||
+    return process_type == switches::kNaClLoaderProcess ||
            process_type == switches::kRelauncherProcess;
   }
 #elif defined(OS_POSIX)
   virtual ZygoteForkDelegate* ZygoteStarting() OVERRIDE {
     // Each Renderer we spawn will re-attempt initialization of the media
     // libraries, at which point failure will be detected and handled, so
     // we do not need to cope with initialization failures here.
     FilePath media_path;
     if (PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path))
       media::InitializeMediaLibrary(media_path);
@@ skipping 30 matching lines @@
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info) {
   ChromeMainDelegate chrome_main_delegate;
   return content::ContentMain(instance, sandbox_info, &chrome_main_delegate);
 #elif defined(OS_POSIX)
 int ChromeMain(int argc, const char** argv) {
   ChromeMainDelegate chrome_main_delegate;
   return content::ContentMain(argc, argv, &chrome_main_delegate);
 #endif
 }