| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #if defined(OS_WIN) | |
| 9 #include "base/win_util.h" | |
| 10 #endif | |
| 11 #include "chrome/app/chrome_dll_resource.h" | 8 #include "chrome/app/chrome_dll_resource.h" |
| 12 #include "chrome/common/chrome_paths.h" | 9 #include "chrome/common/chrome_paths.h" |
| 13 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/pref_names.h" | 11 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/common/url_constants.h" | 12 #include "chrome/common/url_constants.h" |
| 16 #include "chrome/test/automation/tab_proxy.h" | 13 #include "chrome/test/automation/tab_proxy.h" |
| 17 #include "chrome/test/automation/browser_proxy.h" | 14 #include "chrome/test/automation/browser_proxy.h" |
| 18 #include "chrome/test/automation/window_proxy.h" | 15 #include "chrome/test/automation/window_proxy.h" |
| 19 #include "chrome/test/ui/ui_test.h" | 16 #include "chrome/test/ui/ui_test.h" |
| 20 #include "googleurl/src/gurl.h" | 17 #include "googleurl/src/gurl.h" |
| (...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 ASSERT_TRUE(tab->WaitForTabToBeRestored(action_timeout_ms())); | 673 ASSERT_TRUE(tab->WaitForTabToBeRestored(action_timeout_ms())); |
| 677 GURL url; | 674 GURL url; |
| 678 ASSERT_TRUE(tab->GetCurrentURL(&url)); | 675 ASSERT_TRUE(tab->GetCurrentURL(&url)); |
| 679 ASSERT_EQ(http_url, url); | 676 ASSERT_EQ(http_url, url); |
| 680 | 677 |
| 681 // Go back, and see if content is as expected. | 678 // Go back, and see if content is as expected. |
| 682 ASSERT_TRUE(tab->GoBack()); | 679 ASSERT_TRUE(tab->GoBack()); |
| 683 EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false, | 680 EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false, |
| 684 NULL)); | 681 NULL)); |
| 685 } | 682 } |
| OLD | NEW |