Move most of extension_file_util.cc into extensions/common/file_util.cc

chrome/browser/extensions/crx_installer_browsertest.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 "base/memory/ref_counted.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/download_test_observer.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
+#include "extensions/common/file_util.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/switches.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
@@ skipping 104 matching lines @@
  public:
   scoped_ptr<WebstoreInstaller::Approval> GetApproval(
       const char* manifest_dir,
       const std::string& id,
       bool strict_manifest_checks) {
     scoped_ptr<WebstoreInstaller::Approval> result;
 
     base::FilePath ext_path = test_data_dir_.AppendASCII(manifest_dir);
     std::string error;
     scoped_ptr<base::DictionaryValue> parsed_manifest(
-        extension_file_util::LoadManifest(ext_path, &error));
+        file_util::LoadManifest(ext_path, &error));
     if (!parsed_manifest.get() || !error.empty())
       return result.Pass();
 
     return WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
         browser()->profile(),
         id,
         parsed_manifest.Pass(),
         strict_manifest_checks);
   }
 
@@ skipping 327 matching lines @@
   chromeos::FakeUserManager* fake_user_manager =
       new chromeos::FakeUserManager();
   fake_user_manager->AddKioskAppUser("example@example.com");
   fake_user_manager->LoginUser("example@example.com");
   chromeos::ScopedUserManagerEnabler scoped_user_manager(fake_user_manager);
   EXPECT_TRUE(InstallExtension(crx_path, 1));
 #endif
 }
 
 }  // namespace extensions