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

Unified Diff: chrome/browser/ui/webui/options2/browser_options_browsertest.js

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/browser_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options2/browser_options_browsertest.js b/chrome/browser/ui/webui/options2/browser_options_browsertest.js
deleted file mode 100644
index 5dae2d41430cb0f65dd3f218cf4574025ece5856..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options2/browser_options_browsertest.js
+++ /dev/null
@@ -1,31 +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.
-
-/**
- * TestFixture for browser options WebUI testing.
- * @extends {testing.Test}
- * @constructor
- **/
-function BrowserOptionsWebUITest() {}
-
-BrowserOptionsWebUITest.prototype = {
- __proto__: testing.Test.prototype,
-
- /**
- * Browse to browser options.
- **/
- browsePreload: 'chrome://chrome/settings/',
-};
-
-// Test opening the browser options has correct location.
-// Times out on Mac debug only. See http://crbug.com/121030
-GEN('#if defined(OS_MACOSX) && !defined(NDEBUG)');
-GEN('#define MAYBE_testOpenBrowserOptions ' +
- 'DISABLED_testOpenBrowserOptions');
-GEN('#else');
-GEN('#define MAYBE_testOpenBrowserOptions testOpenBrowserOptions');
-GEN('#endif // defined(OS_MACOSX)');
-TEST_F('BrowserOptionsWebUITest', 'MAYBE_testOpenBrowserOptions', function() {
- assertEquals(this.browsePreload, document.location.href);
-});

Powered by Google App Engine
This is Rietveld 408576698