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

chrome/browser/extensions/app_process_apitest.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/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/file_util.h"
 #include "extensions/common/switches.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "sync/api/string_ordinal.h"
 
 using content::NavigationController;
 using content::RenderViewHost;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::Extension;
@@ skipping 253 matching lines @@
       browser()->profile())->extension_service();
   extensions::ProcessMap* process_map =
       extensions::ProcessMap::Get(browser()->profile());
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL base_url = GetTestBaseURL("app_process");
 
   // Load an app as a bookmark app.
   std::string error;
-  scoped_refptr<const Extension> extension(extension_file_util::LoadExtension(
+  scoped_refptr<const Extension> extension(extensions::file_util::LoadExtension(
       test_data_dir_.AppendASCII("app_process"),
       extensions::Manifest::UNPACKED,
       Extension::FROM_BOOKMARK,
       &error));
   service->OnExtensionInstalled(extension.get(),
                                 syncer::StringOrdinal::CreateInitialOrdinal(),
                                 false /* no requirement errors */,
                                 extensions::NOT_BLACKLISTED,
                                 false /* don't wait for idle */);
   ASSERT_TRUE(extension.get());
@@ skipping 555 matching lines @@
   // Navigate the popup to another process outside the app.
   GURL non_app_url(base_url.Resolve("path3/empty.html"));
   ui_test_utils::NavigateToURL(active_browser_list->get(1), non_app_url);
   SiteInstance* new_instance = popup_contents->GetSiteInstance();
   EXPECT_NE(app_instance, new_instance);
 
   // It should still be in the same BrowsingInstance, allowing postMessage to
   // work.
   EXPECT_TRUE(app_instance->IsRelatedSiteInstance(new_instance));
 }