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 "chrome/app/chrome_command_ids.h" | 5 #include "chrome/app/chrome_command_ids.h" |
6 #include "chrome/common/url_constants.h" | 6 #include "chrome/common/url_constants.h" |
7 #include "chrome/test/automation/automation_proxy.h" | 7 #include "chrome/test/automation/automation_proxy.h" |
8 #include "chrome/test/automation/browser_proxy.h" | 8 #include "chrome/test/automation/browser_proxy.h" |
9 #include "chrome/test/automation/tab_proxy.h" | 9 #include "chrome/test/automation/tab_proxy.h" |
10 #include "chrome/test/reliability/automated_ui_test_base.h" | 10 #include "chrome/test/reliability/automated_ui_test_base.h" |
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 #if defined(OS_MACOSX) | 421 #if defined(OS_MACOSX) |
422 #define MAYBE_ShowHistory DISABLED_ShowHistory | 422 #define MAYBE_ShowHistory DISABLED_ShowHistory |
423 #else | 423 #else |
424 #define MAYBE_ShowHistory ShowHistory | 424 #define MAYBE_ShowHistory ShowHistory |
425 #endif | 425 #endif |
426 | 426 |
427 TEST_F(AutomatedUITestBase, MAYBE_ShowHistory) { | 427 TEST_F(AutomatedUITestBase, MAYBE_ShowHistory) { |
428 ASSERT_TRUE(ShowHistory()); | 428 ASSERT_TRUE(ShowHistory()); |
429 GURL url; | 429 GURL url; |
430 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url)); | 430 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url)); |
431 ASSERT_EQ(GURL(chrome::kChromeUIHistoryURL), url); | 431 // TODO(csilv): Update this for uber page. http://crbug.com/111579. |
| 432 ASSERT_EQ(GURL(chrome::kChromeUIHistoryFrameURL), url); |
432 } | 433 } |
OLD | NEW |