Fix extension packer command-line code for Mac

chrome/browser/browser_main.cc

 // Copyright (c) 2010 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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1256 matching lines @@
       parsed_command_line.HasSwitch(switches::kShowIcons))
     return HandleIconsCommands(parsed_command_line);
   if (parsed_command_line.HasSwitch(switches::kMakeDefaultBrowser)) {
     return ShellIntegration::SetAsDefaultBrowser() ?
         ResultCodes::NORMAL_EXIT : ResultCodes::SHELL_INTEGRATION_FAILED;
   }
 
   // If the command line specifies --pack-extension, attempt the pack extension
   // startup action and exit.
   if (parsed_command_line.HasSwitch(switches::kPackExtension)) {
-    extensions_startup::HandlePackExtension(parsed_command_line);
-    return ResultCodes::NORMAL_EXIT;
+    ExtensionsStartupUtil extension_startup_util;
+    if (extension_startup_util.PackExtension(parsed_command_line)) {
+      return ResultCodes::NORMAL_EXIT;
+    } else {
+      return ResultCodes::PACK_EXTENSION_ERROR;
+    }
   }
 
 #if !defined(OS_MACOSX)
   // In environments other than Mac OS X we support import of settings
   // from other browsers. In case this process is a short-lived "import"
   // process that another browser runs just to import the settings, we
   // don't want to be checking for another browser process, by design.
   if (!(parsed_command_line.HasSwitch(switches::kImport) ||
         parsed_command_line.HasSwitch(switches::kImportFromFile))) {
 #endif
@@ skipping 274 matching lines @@
   if (profile->GetExtensionsService()) {
     // This will initialize bookmarks. Call it after bookmark import is done.
     // See issue 40144.
     profile->GetExtensionsService()->InitEventRouters();
   }
 
   // The extension service may be available at this point. If the command line
   // specifies --uninstall-extension, attempt the uninstall extension startup
   // action.
   if (parsed_command_line.HasSwitch(switches::kUninstallExtension)) {
-    if (extensions_startup::HandleUninstallExtension(parsed_command_line,
-                                                     profile)) {
+    ExtensionsStartupUtil ext_startup_util;
+    if (ext_startup_util.UninstallExtension(parsed_command_line, profile)) {
       return ResultCodes::NORMAL_EXIT;
     } else {
       return ResultCodes::UNINSTALL_EXTENSION_ERROR;
     }
   }
 
 #if defined(OS_WIN)
   // We check this here because if the profile is OTR (chromeos possibility)
   // it won't still be accessible after browser is destroyed.
   bool record_search_engine = is_first_run && !profile->IsOffTheRecord();
@@ skipping 131 matching lines @@
 #if defined(OS_CHROMEOS)
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
   TRACE_EVENT_END("BrowserMain", 0, 0);
   return result_code;
 }