Adding the --load-component-extension flag.

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
+#include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/network_action_predictor.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data_remover.h"
@@ skipping 366 matching lines @@
   // Creation has been finished.
   if (delegate_)
     delegate_->OnProfileCreated(this, true);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CREATED,
       content::Source<Profile>(this),
       content::NotificationService::NoDetails());
 }
 
+static void AddOrReplaceComponentExtension(extensions::ComponentLoader* loader,

[Aaron Boodman, 2011/12/06 19:43:35]

Why did you pull this out into a function? It's not repeated. This code can just
go right inside the loop.

Also, even if you were going to do this, it's weird to throw a static function
into the middle of a class's implementation this way.

[SeRya, 2011/12/06 22:19:37]

Reverted this change.

+                                           FilePath const& path) {
+  // Load the component extension manifest synchronously.
+  base::ThreadRestrictions::ScopedAllowIO allow_io;

[Aaron Boodman, 2011/12/06 19:43:35]

This is still making me nervous. Since you are already working on this, can you
please add some logging to understand how it was working without this? This
might be a bad bug that we need to fix.

[SeRya, 2011/12/06 22:19:37]

I will try to figure out why it did work, but the logging probably shouldn't be
in the CL.

+  loader->AddOrReplace(path);
+}
+
 void ProfileImpl::InitExtensions(bool extensions_enabled) {
   if (user_script_master_ || extension_service_.get())
     return;  // Already initialized.
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(
       switches::kEnableExtensionTimelineApi)) {
     extension_devtools_manager_ = new ExtensionDevToolsManager(this);
   }
 
@@ skipping 18 matching lines @@
 #endif
   extension_service_.reset(new ExtensionService(
       this,
       CommandLine::ForCurrentProcess(),
       GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
       extension_prefs_.get(),
       autoupdate_enabled,
       extensions_enabled));
 
   extension_service_->component_loader()->AddDefaultComponentExtensions();
+  if (command_line->HasSwitch(switches::kLoadComponentExtension)) {
+    CommandLine::StringType path_list = command_line->GetSwitchValueNative(
+        switches::kLoadComponentExtension);
+    StringTokenizerT<CommandLine::StringType,
+        CommandLine::StringType::const_iterator> t(path_list,
+                                                   FILE_PATH_LITERAL(","));
+    while (t.GetNext()) {
+      AddOrReplaceComponentExtension(
+          extension_service_->component_loader(), FilePath(t.token()));
+    }
+  }
   extension_service_->Init();
 
   if (extensions_enabled) {
     // Load any extensions specified with --load-extension.
     // TODO(yoz): Seems like this should move into ExtensionService::Init.
     if (command_line->HasSwitch(switches::kLoadExtension)) {
       FilePath path = command_line->GetSwitchValuePath(
           switches::kLoadExtension);
       extensions::UnpackedInstaller::Create(extension_service_.get())->
         LoadFromCommandLine(path);
@@ skipping 1167 matching lines @@
                                      FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }