| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/simple_thread.h" | 7 #include "base/simple_thread.h" |
| 8 #include "base/test/test_file_util.h" | 8 #include "base/test/test_file_util.h" |
| 9 #include "chrome/common/chrome_paths.h" | 9 #include "chrome/common/chrome_paths.h" |
| 10 #include "chrome/test/automation/browser_proxy.h" | 10 #include "chrome/test/automation/browser_proxy.h" |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 | 273 |
| 274 DWORD owner_process() { return owner_process_; } | 274 DWORD owner_process() { return owner_process_; } |
| 275 | 275 |
| 276 private: | 276 private: |
| 277 DWORD owner_process_; | 277 DWORD owner_process_; |
| 278 }; | 278 }; |
| 279 | 279 |
| 280 } // namespace | 280 } // namespace |
| 281 | 281 |
| 282 // Fails, see http://crbug.com/7721. | 282 // Fails, see http://crbug.com/7721. |
| 283 TEST_F(PrintingLayoutTextTest, FAILS_Complex) { | 283 TEST_F(PrintingLayoutTextTest, DISABLED_Complex) { |
| 284 if (IsTestCaseDisabled()) | 284 if (IsTestCaseDisabled()) |
| 285 return; | 285 return; |
| 286 | 286 |
| 287 DismissTheWindow dismisser(base::GetProcId(process())); | 287 DismissTheWindow dismisser(base::GetProcId(process())); |
| 288 base::DelegateSimpleThread close_printdlg_thread(&dismisser, | 288 base::DelegateSimpleThread close_printdlg_thread(&dismisser, |
| 289 "close_printdlg_thread"); | 289 "close_printdlg_thread"); |
| 290 | 290 |
| 291 // Print a document, check its output. | 291 // Print a document, check its output. |
| 292 net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); | 292 net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); |
| 293 ASSERT_TRUE(test_server.Start()); | 293 ASSERT_TRUE(test_server.Start()); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 | 423 |
| 424 // Force a navigation elsewhere to verify that it's fine with it. | 424 // Force a navigation elsewhere to verify that it's fine with it. |
| 425 url = test_server.GetURL("files/printing/test1.html"); | 425 url = test_server.GetURL("files/printing/test1.html"); |
| 426 EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, | 426 EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, |
| 427 tab_proxy->NavigateToURL(url)); | 427 tab_proxy->NavigateToURL(url)); |
| 428 } | 428 } |
| 429 CloseBrowserAndServer(); | 429 CloseBrowserAndServer(); |
| 430 | 430 |
| 431 EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe"; | 431 EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe"; |
| 432 } | 432 } |
| OLD | NEW |