Extensions: Move id_util functions to crx_file component.

chrome/browser/extensions/startup_helper.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/startup_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/browser/extensions/webstore_startup_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/chrome_extensions_client.h"
+#include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "ipc/ipc_message.h"
 
 #if defined(OS_WIN)
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_util.h"
@@ skipping 274 matching lines @@
                                 base::Callback<void()> callback) {
   delete helper;
   callback.Run();
 }
 
 }  // namespace
 
 bool StartupHelper::InstallFromWebstore(const CommandLine& cmd_line,
                                         Profile* profile) {
   std::string id = cmd_line.GetSwitchValueASCII(switches::kInstallFromWebstore);
-  if (!Extension::IdIsValid(id)) {
+  if (!crx_file::id_util::IdIsValid(id)) {
     LOG(ERROR) << "Invalid id for " << switches::kInstallFromWebstore
                << " : '" << id << "'";
     return false;
   }
 
   AppInstallHelper helper;
   base::RunLoop run_loop;
   helper.BeginInstall(profile, id, true, run_loop.QuitClosure());
   run_loop.Run();
 
   if (!helper.success())
     LOG(ERROR) << "InstallFromWebstore failed with error: " << helper.error();
   return helper.success();
 }
 
 void StartupHelper::LimitedInstallFromWebstore(
     const CommandLine& cmd_line,
     Profile* profile,
     base::Callback<void()> done_callback) {
   std::string id = WebStoreIdFromLimitedInstallCmdLine(cmd_line);
-  if (!Extension::IdIsValid(id)) {
+  if (!crx_file::id_util::IdIsValid(id)) {
     LOG(ERROR) << "Invalid index for " << switches::kLimitedInstallFromWebstore;
     done_callback.Run();
     return;
   }
 
   AppInstallHelper* helper = new AppInstallHelper();
   helper->BeginInstall(profile, id, false /*show_prompt*/,
                        base::Bind(&DeleteHelperAndRunCallback,
                                   helper, done_callback));
 }
@@ skipping 10 matching lines @@
   }
   return id;
 }
 
 StartupHelper::~StartupHelper() {
   if (pack_job_.get())
     pack_job_->ClearClient();
 }
 
 }  // namespace extensions