Extensions: Move id_util functions to crx_file component.

components/component_updater/component_updater_utils.cc

 // Copyright 2014 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 "components/component_updater/component_updater_utils.h"
 
 #include <cmath>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/win/windows_version.h"
 #include "components/component_updater/component_updater_configurator.h"
 #include "components/component_updater/crx_update_item.h"
+#include "components/crx_file/id_util.h"
 #include "components/omaha_query_params/omaha_query_params.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using omaha_query_params::OmahaQueryParams;
 
 namespace component_updater {
 
@@ skipping 144 matching lines @@
     int val = 0;
     if (base::HexStringToInt(
             base::StringPiece(hexstr.begin() + i, hexstr.begin() + i + 1),
             &val)) {
       id.append(1, val + 'a');
     } else {
       id.append(1, 'a');
     }
   }
 
-  // TODO(tommycli): Add back the DCHECK validating the generated id. This
-  // requires moving the extension id_util functions into components/crx_file.
+  DCHECK(crx_file::id_util::IdIsValid(id));
 
   return id;
 }
 
 std::string GetCrxComponentID(const CrxComponent& component) {
   return HexStringToID(base::StringToLowerASCII(
       base::HexEncode(&component.pk_hash[0], component.pk_hash.size() / 2)));
 }
 
 }  // namespace component_updater