Make ZIP archiver a component extension.

chrome/browser/extensions/component_loader.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/browser/extensions/component_loader.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 299 matching lines @@
       base::FilePath(FILE_PATH_LITERAL("audio_player")));
 #endif  // defined(OS_CHROMEOS)
 }
 
 void ComponentLoader::AddGalleryExtension() {
 #if defined(OS_CHROMEOS)
   Add(IDR_GALLERY_MANIFEST, base::FilePath(FILE_PATH_LITERAL("gallery")));
 #endif
 }
 
+void ComponentLoader::AddZipArchiverExtension() {
+#if defined(OS_CHROMEOS)
+  Add(IDR_ZIP_ARCHIVER_MANIFEST,
+      base::FilePath(FILE_PATH_LITERAL("zip_archiver")));
+#endif  // defined(OS_CHROMEOS)
+}
+
 void ComponentLoader::AddWebstoreWidgetExtension() {
 #if defined(OS_CHROMEOS)
   AddWithNameAndDescription(
       IDR_CHROME_APPS_WEBSTORE_WIDGET_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("webstore_widget")),
       l10n_util::GetStringUTF8(IDS_WEBSTORE_WIDGET_APP_NAME),
       l10n_util::GetStringUTF8(IDS_WEBSTORE_WIDGET_APP_DESC));
 #endif
 }
 
@@ skipping 218 matching lines @@
                                 ash::GetChromeOSDeviceName()));
 #endif
 
   if (!skip_session_components) {
     AddVideoPlayerExtension();
     AddAudioPlayerExtension();
     AddFileManagerExtension();
     AddGalleryExtension();
     AddWebstoreWidgetExtension();
 
+#if defined(OS_CHROMEOS)

[benwells, 2017/04/14 05:12:32]

why do you need the flag here and in the body of AddZipArchiverExtension?

The pattern to these commands is to check conditional things in the body of the
function, so you should just call AddZipArchiverExtension here, and check the
build and command line in the body.

+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kEnableZipArchiverOnFileManager)) {
+      AddZipArchiverExtension();
+    }
+#endif
+
     AddHangoutServicesExtension();
     AddHotwordAudioVerificationApp();
     AddHotwordHelperExtension();
     AddImageLoaderExtension();
 
     bool install_feedback = enable_background_extensions_during_testing;
 #if defined(GOOGLE_CHROME_BUILD)
     install_feedback = true;
 #endif  // defined(GOOGLE_CHROME_BUILD)
     if (install_feedback)
@@ skipping 116 matching lines @@
     return;  // Error already logged.
   std::string actual_extension_id =
       Add(std::move(manifest), root_directory, false);
   CHECK_EQ(extension_id, actual_extension_id);
   if (!done_cb.is_null())
     done_cb.Run();
 }
 #endif
 
 }  // namespace extensions