Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / all_urls_apitest.cc

diff --git a/src/chrome/browser/extensions/all_urls_apitest.cc b/src/chrome/browser/extensions/all_urls_apitest.cc
index 8b59028..6c947f6 100644 (file)
--- a/src/chrome/browser/extensions/all_urls_apitest.cc
+++ b/src/chrome/browser/extensions/all_urls_apitest.cc
@@ -5,15 +5,15 @@
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extensions_client.h"
-#include "extensions/common/id_util.h"
+#include "extensions/test/extension_test_message_listener.h"
 
 const std::string kAllUrlsTarget =
     "files/extensions/api_test/all_urls/index.html";
@@ -41,8 +41,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) {
 
   // Then add the two extensions to the whitelist.
   extensions::ExtensionsClient::ScriptingWhitelist whitelist;
-  whitelist.push_back(extensions::id_util::GenerateIdForPath(extension_dir1));
-  whitelist.push_back(extensions::id_util::GenerateIdForPath(extension_dir2));
+  whitelist.push_back(crx_file::id_util::GenerateIdForPath(extension_dir1));
+  whitelist.push_back(crx_file::id_util::GenerateIdForPath(extension_dir2));
   extensions::ExtensionsClient::Get()->SetScriptingWhitelist(whitelist);
 
   // Then load extensions.