Extensions: Move id_util functions to crx_file component.

chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.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/api/push_messaging/push_messaging_invalidation_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
+#include "components/crx_file/id_util.h"
 #include "components/invalidation/invalidation_service.h"
 #include "components/invalidation/object_id_invalidation_map.h"
 #include "extensions/common/extension.h"
 #include "google/cacheinvalidation/types.pb.h"
 
 namespace extensions {
 
 namespace {
 
 const int kNumberOfSubchannels = 4;
@@ skipping 30 matching lines @@
   std::vector<std::string> components;
   base::SplitStringDontTrim(name, '/', &components);
   if (components.size() < 3) {
     DLOG(WARNING) << "Invalid format type from object name " << name;
     return false;
   }
   if (components[0] != "U") {
     DLOG(WARNING) << "Invalid format type from object name " << name;
     return false;
   }
-  if (!Extension::IdIsValid(components[1])) {
+  if (!crx_file::id_util::IdIsValid(components[1])) {
     DLOG(WARNING) << "Invalid extension ID from object name " << name;
     return false;
   }
   *extension_id = components[1];
   if (!base::StringToInt(components[2], subchannel)) {
     DLOG(WARNING) << "Subchannel not a number from object name " << name;
     return false;
   }
   if (*subchannel < 0 || *subchannel >= kNumberOfSubchannels) {
     DLOG(WARNING) << "Subchannel out of range from object name " << name;
@@ skipping 22 matching lines @@
     const std::string& extension_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const syncer::ObjectIdSet& suppressed_ids =
       ExtensionIdToObjectIds(extension_id);
   suppressed_ids_.insert(suppressed_ids.begin(), suppressed_ids.end());
 }
 
 void PushMessagingInvalidationHandler::RegisterExtension(
     const std::string& extension_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(Extension::IdIsValid(extension_id));
+  DCHECK(crx_file::id_util::IdIsValid(extension_id));
   registered_extensions_.insert(extension_id);
   UpdateRegistrations();
 }
 
 void PushMessagingInvalidationHandler::UnregisterExtension(
     const std::string& extension_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(Extension::IdIsValid(extension_id));
+  DCHECK(crx_file::id_util::IdIsValid(extension_id));
   registered_extensions_.erase(extension_id);
   UpdateRegistrations();
 }
 
 void PushMessagingInvalidationHandler::OnInvalidatorStateChange(
     syncer::InvalidatorState state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Nothing to do.
 }
 
@@ skipping 64 matching lines @@
   for (std::set<std::string>::const_iterator it =
        registered_extensions_.begin(); it != registered_extensions_.end();
        ++it) {
     const syncer::ObjectIdSet& object_ids = ExtensionIdToObjectIds(*it);
     ids.insert(object_ids.begin(), object_ids.end());
   }
   service_->UpdateRegisteredInvalidationIds(this, ids);
 }
 
 }  // namespace extensions