Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: chrome/browser/ui/webui/options/options_ui_uitest.cc

Issue 8574024: Disables two tests that seem to fail on aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 TEST_F(OptionsUITest, LoadOptionsByURL) { 54 // See bug 104393.
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) {
55 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); 62 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
56 ASSERT_TRUE(browser.get()); 63 ASSERT_TRUE(browser.get());
57 64
58 scoped_refptr<TabProxy> tab = browser->GetActiveTab(); 65 scoped_refptr<TabProxy> tab = browser->GetActiveTab();
59 ASSERT_TRUE(tab.get()); 66 ASSERT_TRUE(tab.get());
60 67
61 NavigateToSettings(tab); 68 NavigateToSettings(tab);
62 VerifyTitle(tab); 69 VerifyTitle(tab);
63 VerifyNavbar(tab); 70 VerifyNavbar(tab);
64 VerifySections(tab); 71 VerifySections(tab);
65 } 72 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698