Move CrxFile, FileReader, ExtensionResource to src/extensions.

chrome/browser/sync/test/integration/sync_app_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/sync/test/integration/sync_app_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
+#include "extensions/common/id_util.h"
 
 namespace {
 
 struct AppState {
   AppState();
   ~AppState();
   bool IsValid() const;
   bool Equals(const AppState& other) const;
 
   syncer::StringOrdinal app_launch_ordinal;
@@ skipping 114 matching lines @@
     ++it2;
   }
 
   return true;
 }
 
 syncer::StringOrdinal SyncAppHelper::GetPageOrdinalForApp(
     Profile* profile,
     const std::string& name) {
   return profile->GetExtensionService()->extension_prefs()->
-      extension_sorting()->GetPageOrdinal(SyncExtensionHelper::NameToId(name));
+      extension_sorting()->GetPageOrdinal(
+          extensions::id_util::GenerateId(name));
 }
 
 void SyncAppHelper::SetPageOrdinalForApp(
     Profile* profile,
     const std::string& name,
     const syncer::StringOrdinal& page_ordinal) {
   profile->GetExtensionService()->extension_prefs()->extension_sorting()->
-      SetPageOrdinal(SyncExtensionHelper::NameToId(name), page_ordinal);
+      SetPageOrdinal(extensions::id_util::GenerateId(name), page_ordinal);
 }
 
 syncer::StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name) {
   return profile->GetExtensionService()->extension_prefs()->
       extension_sorting()->GetAppLaunchOrdinal(
-          SyncExtensionHelper::NameToId(name));
+          extensions::id_util::GenerateId(name));
 }
 
 void SyncAppHelper::SetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name,
     const syncer::StringOrdinal& app_launch_ordinal) {
   profile->GetExtensionService()->extension_prefs()->extension_sorting()->
-      SetAppLaunchOrdinal(SyncExtensionHelper::NameToId(name),
+      SetAppLaunchOrdinal(extensions::id_util::GenerateId(name),
                           app_launch_ordinal);
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
   profile->GetExtensionService()->extension_prefs()->extension_sorting()->
       FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}