Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / test / gpu / webgl_infobar_browsertest.cc

diff --git a/src/chrome/test/gpu/webgl_infobar_browsertest.cc b/src/chrome/test/gpu/webgl_infobar_browsertest.cc
index 2ebbb03..f906aca 100644 (file)
--- a/src/chrome/test/gpu/webgl_infobar_browsertest.cc
+++ b/src/chrome/test/gpu/webgl_infobar_browsertest.cc
@@ -6,7 +6,6 @@
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -15,20 +14,21 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/grit/theme_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_paths.h"
-#include "content/public/common/page_transition_types.h"
 #include "content/public/test/browser_test_utils.h"
 #include "gpu/config/gpu_test_config.h"
-#include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/page_transition_types.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace {
@@ -42,9 +42,9 @@ void SimulateGPUCrash(Browser* browser) {
   chrome::NavigateParams params(
       browser,
       GURL(content::kChromeUIGpuCrashURL),
-      static_cast<content::PageTransition>(
-          content::PAGE_TRANSITION_TYPED |
-          content::PAGE_TRANSITION_FROM_ADDRESS_BAR));
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_TYPED |
+          ui::PAGE_TRANSITION_FROM_ADDRESS_BAR));
   params.disposition = NEW_BACKGROUND_TAB;
   chrome::Navigate(&params);
 }