| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "app/app_switches.h" | 7 #include "app/app_switches.h" |
| 8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
| 9 #include "app/message_box_flags.h" | 9 #include "app/message_box_flags.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 894 // Now destroy the external tab | 894 // Now destroy the external tab |
| 895 proxy->DestroyHostWindow(); | 895 proxy->DestroyHostWindow(); |
| 896 proxy->WaitForTabCleanup(tab, action_max_timeout_ms()); | 896 proxy->WaitForTabCleanup(tab, action_max_timeout_ms()); |
| 897 | 897 |
| 898 EXPECT_FALSE(tab->is_valid()); | 898 EXPECT_FALSE(tab->is_valid()); |
| 899 EXPECT_EQ(FALSE, ::IsWindow(external_tab_container)); | 899 EXPECT_EQ(FALSE, ::IsWindow(external_tab_container)); |
| 900 EXPECT_EQ(FALSE, ::IsWindow(tab_wnd)); | 900 EXPECT_EQ(FALSE, ::IsWindow(tab_wnd)); |
| 901 } | 901 } |
| 902 } | 902 } |
| 903 | 903 |
| 904 TEST_F(ExternalTabTestType, IncognitoMode) { | 904 // Freezes randomly causing the entire ui test to hang |
| 905 // http://code.google.com/p/chromium/issues/detail?id=24664 |
| 906 TEST_F(ExternalTabTestType, DISABLED_IncognitoMode) { |
| 905 AutomationProxyForExternalTab* proxy = | 907 AutomationProxyForExternalTab* proxy = |
| 906 static_cast<AutomationProxyForExternalTab*>(automation()); | 908 static_cast<AutomationProxyForExternalTab*>(automation()); |
| 907 HWND external_tab_container = NULL; | 909 HWND external_tab_container = NULL; |
| 908 HWND tab_wnd = NULL; | 910 HWND tab_wnd = NULL; |
| 909 | 911 |
| 910 // Create incognito tab | 912 // Create incognito tab |
| 911 GURL url("http://anatomyofmelancholy.net"); | 913 GURL url("http://anatomyofmelancholy.net"); |
| 912 scoped_refptr<TabProxy> tab(proxy->CreateTabWithHostWindow(true, url, | 914 scoped_refptr<TabProxy> tab(proxy->CreateTabWithHostWindow(true, url, |
| 913 &external_tab_container, &tab_wnd)); | 915 &external_tab_container, &tab_wnd)); |
| 914 EXPECT_TRUE(proxy->WaitForNavigation(action_max_timeout_ms())); | 916 EXPECT_TRUE(proxy->WaitForNavigation(action_max_timeout_ms())); |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1179 | 1181 |
| 1180 // Allow some time for the popup to show up and close. | 1182 // Allow some time for the popup to show up and close. |
| 1181 PlatformThread::Sleep(2000); | 1183 PlatformThread::Sleep(2000); |
| 1182 | 1184 |
| 1183 std::wstring expected(L"string"); | 1185 std::wstring expected(L"string"); |
| 1184 std::wstring jscript = CreateJSString(L"\"" + expected + L"\""); | 1186 std::wstring jscript = CreateJSString(L"\"" + expected + L"\""); |
| 1185 std::wstring actual; | 1187 std::wstring actual; |
| 1186 ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual)); | 1188 ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual)); |
| 1187 ASSERT_EQ(expected, actual); | 1189 ASSERT_EQ(expected, actual); |
| 1188 } | 1190 } |
| OLD | NEW |