Revert 121236 - Support sharing of ContentMain and BrowserMain code with embedded use cases (try ...

chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 11 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #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/common/content_counters.h"
+#include "content/public/app/content_main_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/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 647 matching lines @@
 #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);
   }
 
-  return -1;
+  NOTREACHED() << "Unknown process type: " << process_type;
+  return 1;
 }
 
 void ChromeMainDelegate::ProcessExiting(const std::string& process_type) {
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   logging::CleanupChromeLogging();
 }
 
 #if defined(OS_MACOSX)
@@ skipping 42 matching lines @@
 
 #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.
   InitCrashReporter();
 #endif
 
   InitializeChromeContentClient(process_type);
 }
 #endif  // OS_MACOSX