Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/extensions/extension_install_ui_browsertest.cc b/src/chrome/browser/extensions/extension_install_ui_browsertest.cc
index ba9fca2..9834111 100644 (file)
--- a/src/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ b/src/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -17,17 +17,17 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/crx_file/id_util.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/extension_prefs.h"
-#include "extensions/common/id_util.h"
+#include "extensions/common/constants.h"
 
 using content::WebContents;
 using extensions::AppSorting;
@@ -224,10 +224,10 @@ IN_PROC_BROWSER_TEST_F(NewTabUISortingBrowserTest,
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
   base::FilePath app_dir = test_data_dir_.AppendASCII("app");
-  const std::string app_id = extensions::id_util::GenerateIdForPath(app_dir);
+  const std::string app_id = crx_file::id_util::GenerateIdForPath(app_dir);
 
   const extensions::Extension* webstore_extension =
-      service->GetInstalledExtension(extension_misc::kWebStoreAppId);
+      service->GetInstalledExtension(extensions::kWebStoreAppId);
   EXPECT_TRUE(webstore_extension);
   AppSorting* sorting =
       extensions::ExtensionPrefs::Get(browser()->profile())->app_sorting();
@@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(NewTabUISortingBrowserTest,
   EXPECT_FALSE(service->GetInstalledExtension(app_id));
   // Move the test app from the end to be before the web store.
   sorting->OnExtensionMoved(
-      app_id, std::string(), extension_misc::kWebStoreAppId);
+      app_id, std::string(), extensions::kWebStoreAppId);
   EXPECT_EQ(app_id, last_reordered_extension_id_);
 
   // Now install the app.