OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser/ui/webui/options/options_ui_uitest.h" | 5 #include "chrome/browser/ui/webui/options/options_ui_uitest.h" |
6 | 6 |
7 #include "base/string16.h" | 7 #include "base/string16.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
10 #include "chrome/test/automation/automation_proxy.h" | 10 #include "chrome/test/automation/automation_proxy.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 #else | 44 #else |
45 const int kExpectedSections = 1 + 4; | 45 const int kExpectedSections = 1 + 4; |
46 #endif | 46 #endif |
47 int num_of_sections = 0; | 47 int num_of_sections = 0; |
48 EXPECT_TRUE(tab->ExecuteAndExtractInt(L"", | 48 EXPECT_TRUE(tab->ExecuteAndExtractInt(L"", |
49 L"domAutomationController.send(" | 49 L"domAutomationController.send(" |
50 L"document.getElementById('navbar').children.length)", &num_of_sections)); | 50 L"document.getElementById('navbar').children.length)", &num_of_sections)); |
51 EXPECT_EQ(kExpectedSections, num_of_sections); | 51 EXPECT_EQ(kExpectedSections, num_of_sections); |
52 } | 52 } |
53 | 53 |
54 // See bug 104393. | 54 TEST_F(OptionsUITest, LoadOptionsByURL) { |
55 #if defined(USE_AURA) | |
56 #define MAYBE_LoadOptionsByURL FAILS_LoadOptionsByURL | |
57 #else | |
58 #define MAYBE_LoadOptionsByURL LoadOptionsByURL | |
59 #endif | |
60 | |
61 TEST_F(OptionsUITest, MAYBE_LoadOptionsByURL) { | |
62 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 55 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
63 ASSERT_TRUE(browser.get()); | 56 ASSERT_TRUE(browser.get()); |
64 | 57 |
65 scoped_refptr<TabProxy> tab = browser->GetActiveTab(); | 58 scoped_refptr<TabProxy> tab = browser->GetActiveTab(); |
66 ASSERT_TRUE(tab.get()); | 59 ASSERT_TRUE(tab.get()); |
67 | 60 |
68 NavigateToSettings(tab); | 61 NavigateToSettings(tab); |
69 VerifyTitle(tab); | 62 VerifyTitle(tab); |
70 VerifyNavbar(tab); | 63 VerifyNavbar(tab); |
71 VerifySections(tab); | 64 VerifySections(tab); |
72 } | 65 } |
OLD | NEW |