OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/tools/test_shell/test_shell_test.h" | 5 #include "webkit/tools/test_shell/test_shell_test.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 data_dir_ = data_dir_.Append(FILE_PATH_LITERAL("data")); | 35 data_dir_ = data_dir_.Append(FILE_PATH_LITERAL("data")); |
36 ASSERT_TRUE(file_util::PathExists(data_dir_)); | 36 ASSERT_TRUE(file_util::PathExists(data_dir_)); |
37 } | 37 } |
38 | 38 |
39 void TestShellTest::TearDown() { | 39 void TestShellTest::TearDown() { |
40 // Loading a blank url clears the memory in the current page. | 40 // Loading a blank url clears the memory in the current page. |
41 test_shell_->LoadURL(GURL("about:blank")); | 41 test_shell_->LoadURL(GURL("about:blank")); |
42 test_shell_->DestroyWindow(test_shell_->mainWnd()); | 42 test_shell_->DestroyWindow(test_shell_->mainWnd()); |
43 | 43 |
44 // Flush the MessageLoop of any residual tasks. | 44 // Flush the MessageLoop of any residual tasks. |
45 MessageLoop::current()->RunAllPending(); | 45 MessageLoop::current()->RunUntilIdle(); |
46 } | 46 } |
47 | 47 |
48 void TestShellTest::CreateEmptyWindow() { | 48 void TestShellTest::CreateEmptyWindow() { |
49 TestShell::CreateNewWindow(GURL("about:blank"), &test_shell_); | 49 TestShell::CreateNewWindow(GURL("about:blank"), &test_shell_); |
50 } | 50 } |
OLD | NEW |