Upstream version 5.34.104.0

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

diff --git a/src/chrome/browser/extensions/alert_apitest.cc b/src/chrome/browser/extensions/alert_apitest.cc
index f91d9b8..ac78caa 100644 (file)
--- a/src/chrome/browser/extensions/alert_apitest.cc
+++ b/src/chrome/browser/extensions/alert_apitest.cc
@@ -5,14 +5,14 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/browser/process_manager.h"
+#include "extensions/common/extension.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) {
   ASSERT_TRUE(RunExtensionTest("alert")) << message_;
@@ -22,8 +22,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) {
       extensions::ExtensionSystem::Get(browser()->profile())->
           process_manager()->GetBackgroundHostForExtension(extension->id());
   ASSERT_TRUE(host);
-  host->render_view_host()->ExecuteJavascriptInWebFrame(string16(),
-      ASCIIToUTF16("alert('This should not crash.');"));
+  host->render_view_host()->ExecuteJavascriptInWebFrame(base::string16(),
+      base::ASCIIToUTF16("alert('This should not crash.');"));
 
   AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
   ASSERT_TRUE(alert);