Extensions: Move id_util functions to crx_file component.

chrome/browser/media_galleries/media_galleries_test_util.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/media_galleries/media_galleries_test_util.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
+#include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/media_galleries/fileapi/iapps_finder_impl.h"
 #include "components/policy/core/common/preferences_mock_mac.h"
 #endif  // OS_MACOSX
 
@@ skipping 28 matching lines @@
 
   extensions::ExtensionPrefs* extension_prefs =
       extensions::ExtensionPrefs::Get(profile);
   base::FilePath path = extension_prefs->install_directory().AppendASCII(name);
   std::string errors;
   scoped_refptr<extensions::Extension> extension =
       extensions::Extension::Create(path, extensions::Manifest::INTERNAL,
                                     *manifest.get(),
                                     extensions::Extension::NO_FLAGS, &errors);
   EXPECT_TRUE(extension.get() != NULL) << errors;
-  EXPECT_TRUE(extensions::Extension::IdIsValid(extension->id()));
-  if (!extension.get() || !extensions::Extension::IdIsValid(extension->id()))
+  EXPECT_TRUE(crx_file::id_util::IdIsValid(extension->id()));
+  if (!extension.get() || !crx_file::id_util::IdIsValid(extension->id()))
     return NULL;
 
   extension_prefs->OnExtensionInstalled(
       extension.get(),
       extensions::Extension::ENABLED,
       syncer::StringOrdinal::CreateInitialOrdinal(),
       std::string());
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   extension_service->AddExtension(extension.get());
@@ skipping 146 matching lines @@
 
 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) {
 #if defined(OS_WIN)
   return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir);
 #elif defined(OS_POSIX)
   return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir);
 #else
   NOTREACHED();
 #endif
 }