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

Unified Diff: chrome/browser/ui/webui/options2/options_ui_browsertest.cc

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wut Created 8 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options2/options_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/options2/options_ui_browsertest.cc b/chrome/browser/ui/webui/options2/options_ui_browsertest.cc
deleted file mode 100644
index 1dd06e219e528fcfa426d9678f0a18a9dfbfc0b5..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options2/options_ui_browsertest.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/webui/options2/options_ui_browsertest.h"
-
-#include "base/string16.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/common/url_constants.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/test/browser_test_utils.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-
-namespace options {
-
-OptionsBrowserTest::OptionsBrowserTest() {
-}
-
-void OptionsBrowserTest::NavigateToSettings() {
- const GURL& url = GURL(chrome::kChromeUISettingsURL);
- ui_test_utils::NavigateToURL(browser(), url);
-}
-
-void OptionsBrowserTest::VerifyNavbar() {
- bool navbar_exist = false;
- EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
- L"",
- L"domAutomationController.send("
- L"!!document.getElementById('navigation'))", &navbar_exist));
- EXPECT_EQ(true, navbar_exist);
-}
-
-void OptionsBrowserTest::VerifyTitle() {
- string16 title = chrome::GetActiveWebContents(browser())->GetTitle();
- string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);
- EXPECT_NE(title.find(expected_title), string16::npos);
-}
-
-// Flaky, see http://crbug.com/119671.
-IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, FLAKY_LoadOptionsByURL) {
- NavigateToSettings();
- VerifyTitle();
- VerifyNavbar();
-}
-
-} // namespace options

Powered by Google App Engine
This is Rietveld 408576698