X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fbrowser_browsertest.cc;h=d51b6dc02db323ad0e2b639857640d1db3524942;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=f4acb79df4925c3598864a9f3df745b1cc918703;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/ui/browser_browsertest.cc b/src/chrome/browser/ui/browser_browsertest.cc index f4acb79..d51b6dc 100644 --- a/src/chrome/browser/ui/browser_browsertest.cc +++ b/src/chrome/browser/ui/browser_browsertest.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" @@ -17,7 +18,7 @@ #include "chrome/browser/command_updater.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/devtools/devtools_window.h" +#include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" @@ -30,7 +31,7 @@ #include "chrome/browser/sessions/session_backend.h" #include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" -#include "chrome/browser/translate/translate_browser_test_utils.h" +#include "chrome/browser/translate/cld_data_harness.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" @@ -79,6 +80,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "grit/chromium_strings.h" @@ -852,7 +854,7 @@ class BeforeUnloadAtQuitWithTwoWindows : public InProcessBrowserTest { // This test is for testing a specific shutdown behavior. This mimics what // happens in InProcessBrowserTest::RunTestOnMainThread and QuitBrowsers, but // ensures that it happens through the single IDC_EXIT of the test. - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Cycle both the MessageLoop and the Cocoa runloop twice to flush out any // Chrome work that generates Cocoa work. Do this twice since there are two // Browsers that must be closed. @@ -1306,7 +1308,10 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TabClosingWhenRemovingExtension) { // Uninstall the extension and make sure TabClosing is sent. ExtensionService* service = extensions::ExtensionSystem::Get( browser()->profile())->extension_service(); - service->UninstallExtension(GetExtension()->id(), false, NULL); + service->UninstallExtension(GetExtension()->id(), + extensions::UNINSTALL_REASON_FOR_TESTING, + base::Bind(&base::DoNothing), + NULL); EXPECT_EQ(1, observer.closing_count()); model->RemoveObserver(&observer); @@ -1371,9 +1376,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) { NEW_WINDOW)); ASSERT_TRUE(app_window); - DevToolsWindow::OpenDevToolsWindowForTest( - browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - false); + DevToolsWindow* devtools_window = + DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); // The launch should have created a new app browser and a dev tools browser. ASSERT_EQ(3u, @@ -1400,16 +1404,19 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) { dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)); EXPECT_FALSE( app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)); + + DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); } #endif // Tests that the CLD (Compact Language Detection) works properly. IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { - test::ScopedCLDDynamicDataHarness dynamic_data_scope; - ASSERT_NO_FATAL_FAILURE(dynamic_data_scope.Init()); + scoped_ptr cld_data_harness = + test::CreateCldDataHarness(); + ASSERT_NO_FATAL_FAILURE(cld_data_harness->Init()); ASSERT_TRUE(test_server()->Start()); - LanguageDetectionDetails details; + translate::LanguageDetectionDetails details; // Open a new tab with a page in English. AddTabAtIndex(0, GURL(test_server()->GetURL("files/english_page.html")), @@ -1422,7 +1429,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { content::Source source(current_web_contents); ui_test_utils::WindowedNotificationObserverWithDetails< - LanguageDetectionDetails> + translate::LanguageDetectionDetails> en_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, source); EXPECT_EQ("", @@ -1436,7 +1443,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { // Now navigate to a page in French. ui_test_utils::WindowedNotificationObserverWithDetails< - LanguageDetectionDetails> + translate::LanguageDetectionDetails> fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, source); ui_test_utils::NavigateToURL( @@ -1805,6 +1812,20 @@ void OnZoomLevelChanged(const base::Closure& callback, #else #define MAYBE_PageZoom PageZoom #endif + +namespace { + +int GetZoomPercent(const content::WebContents* contents, + bool* enable_plus, + bool* enable_minus) { + int percent = ZoomController::FromWebContents(contents)->GetZoomPercent(); + *enable_plus = percent < contents->GetMaximumZoomPercent(); + *enable_minus = percent > contents->GetMinimumZoomPercent(); + return percent; +} + +} // namespace + IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageZoom) { WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); bool enable_plus, enable_minus; @@ -1820,7 +1841,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageZoom) { chrome::Zoom(browser(), content::PAGE_ZOOM_IN); loop_runner->Run(); sub.reset(); - EXPECT_EQ(contents->GetZoomPercent(&enable_plus, &enable_minus), 110); + EXPECT_EQ(GetZoomPercent(contents, &enable_plus, &enable_minus), 110); EXPECT_TRUE(enable_plus); EXPECT_TRUE(enable_minus); } @@ -1836,7 +1857,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageZoom) { chrome::Zoom(browser(), content::PAGE_ZOOM_RESET); loop_runner->Run(); sub.reset(); - EXPECT_EQ(contents->GetZoomPercent(&enable_plus, &enable_minus), 100); + EXPECT_EQ(GetZoomPercent(contents, &enable_plus, &enable_minus), 100); EXPECT_TRUE(enable_plus); EXPECT_TRUE(enable_minus); } @@ -1852,7 +1873,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageZoom) { chrome::Zoom(browser(), content::PAGE_ZOOM_OUT); loop_runner->Run(); sub.reset(); - EXPECT_EQ(contents->GetZoomPercent(&enable_plus, &enable_minus), 90); + EXPECT_EQ(GetZoomPercent(contents, &enable_plus, &enable_minus), 90); EXPECT_TRUE(enable_plus); EXPECT_TRUE(enable_minus); } @@ -1960,8 +1981,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialClosesDialogs) { EXPECT_FALSE(contents->GetRenderProcessHost()->IgnoreInputEvents()); } - -IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCloseTab) { +#if defined(OS_MACOSX) +// http://crbug.com/393218 +#define MAYBE_InterstitialCloseTab DISABLED_InterstitialCloseTab +#else +#define MAYBE_InterstitialCloseTab InterstitialCloseTab +#endif +IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_InterstitialCloseTab) { WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); { @@ -2486,7 +2512,13 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenControlShiftClickTest) { } // Middle-clicks open in a background tab. -IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenMiddleClickTest) { +#if defined(OS_LINUX) +// http://crbug.com/396347 +#define MAYBE_WindowOpenMiddleClickTest DISABLED_WindowOpenMiddleClickTest +#else +#define MAYBE_WindowOpenMiddleClickTest WindowOpenMiddleClickTest +#endif +IN_PROC_BROWSER_TEST_F(ClickModifierTest, MAYBE_WindowOpenMiddleClickTest) { int modifiers = 0; blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle; WindowOpenDisposition disposition = NEW_BACKGROUND_TAB; @@ -2536,7 +2568,8 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefControlClickTest) { // Control-shift-clicks open in a foreground tab. // On OSX meta [the command key] takes the place of control. -IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefControlShiftClickTest) { +// http://crbug.com/396347 +IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefControlShiftClickTest) { #if defined(OS_MACOSX) int modifiers = blink::WebInputEvent::MetaKey; #else @@ -2557,7 +2590,8 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefMiddleClickTest) { } // Shift-middle-clicks open in a foreground tab. -IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { +// http://crbug.com/396347 +IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefShiftMiddleClickTest) { int modifiers = blink::WebInputEvent::ShiftKey; blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle; WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;