Extensions: Move id_util functions to crx_file component.

chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

 // Copyright 2013 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/ui/webui/extensions/chromeos/kiosk_apps_handler.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/crx_file/id_util.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
-#include "extensions/common/extension.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "url/gurl.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 14 matching lines @@
       KioskAppManager::Get()->GetAutoLaunchApp() == app_data.app_id &&
       (KioskAppManager::Get()->IsAutoLaunchEnabled() ||
           KioskAppManager::Get()->IsAutoLaunchRequested()));
   app_dict->SetBoolean("isLoading", app_data.is_loading);
 }
 
 // Sanitize app id input value and extracts app id out of it.
 // Returns false if an app id could not be derived out of the input.
 bool ExtractsAppIdFromInput(const std::string& input,
                             std::string* app_id) {
-  if (extensions::Extension::IdIsValid(input)) {
+  if (crx_file::id_util::IdIsValid(input)) {
     *app_id = input;
     return true;
   }
 
   GURL webstore_url = GURL(input);
   if (!webstore_url.is_valid())
     return false;
 
   GURL webstore_base_url =
       GURL(extension_urls::GetWebstoreItemDetailURLPrefix());
 
   if (webstore_url.scheme() != webstore_base_url.scheme() ||
       webstore_url.host() != webstore_base_url.host() ||
       !StartsWithASCII(
           webstore_url.path(), webstore_base_url.path(), true)) {
     return false;
   }
 
   const std::string path = webstore_url.path();
   const size_t last_slash = path.rfind('/');
   if (last_slash == std::string::npos)
     return false;
 
   const std::string candidate_id = path.substr(last_slash + 1);
-  if (!extensions::Extension::IdIsValid(candidate_id))
+  if (!crx_file::id_util::IdIsValid(candidate_id))
     return false;
 
   *app_id = candidate_id;
   return true;
 }
 
 }  // namespace
 
 KioskAppsHandler::KioskAppsHandler()
     : kiosk_app_manager_(KioskAppManager::Get()),
@@ skipping 248 matching lines @@
 
 void KioskAppsHandler::ShowError(const std::string& app_id) {
   base::StringValue app_id_value(app_id);
   web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.showError",
                                    app_id_value);
 
   kiosk_app_manager_->RemoveApp(app_id);
 }
 
 }  // namespace chromeos