Move CrxFile, FileReader, ExtensionResource to src/extensions.

chrome/browser/sync/test/integration/sync_extension_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_extension_helper.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "extensions/common/id_util.h"
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
 using extensions::Manifest;
 
 SyncExtensionHelper::ExtensionState::ExtensionState()
     : enabled_state(ENABLED), incognito_enabled(false) {}
 
 SyncExtensionHelper::ExtensionState::~ExtensionState() {}
 
 bool SyncExtensionHelper::ExtensionState::Equals(
     const SyncExtensionHelper::ExtensionState &other) const {
   return ((enabled_state == other.enabled_state) &&
           (incognito_enabled == other.incognito_enabled));
 }
 
 // static
 SyncExtensionHelper* SyncExtensionHelper::GetInstance() {
   SyncExtensionHelper* instance = Singleton<SyncExtensionHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
 
 SyncExtensionHelper::SyncExtensionHelper() : setup_completed_(false) {}
 
 SyncExtensionHelper::~SyncExtensionHelper() {}
 
 // static
 std::string SyncExtensionHelper::NameToId(const std::string& name) {

[Jeffrey Yasskin, 2013/03/22 20:26:50]

Inline this now?

[Yoyo Zhou, 2013/03/22 21:33:32]

Done.

-  std::string id;
-  EXPECT_TRUE(Extension::GenerateId(name, &id));
-  return id;
+  return extensions::id_util::GenerateId(name);
 }
 
 void SyncExtensionHelper::SetupIfNecessary(SyncTest* test) {
   if (setup_completed_)
     return;
 
   for (int i = 0; i < test->num_clients(); ++i) {
     SetupProfile(test->GetProfile(i));
   }
   SetupProfile(test->verifier());
@@ skipping 303 matching lines @@
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   DVLOG(2) << "created extension with name = "
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   id_to_type_[expected_id] = type;
   return extension;
 }