Revert 115057 - Moved all options2 files to the options2 namespace.

BUG=100885
TEST=everything compiles

Review URL: http://codereview.chromium.org/8947010

TBR=binji@chromium.org
Review URL: http://codereview.chromium.org/8989005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115060 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 42 deletions

diff --git a/chrome/browser/ui/webui/options2/options_ui2_uitest.h b/chrome/browser/ui/webui/options2/options_ui2_uitest.h
deleted file mode 100644
index e184c4b..0000000
--- a/chrome/browser/ui/webui/options2/options_ui2_uitest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_UITEST_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_UITEST_H_
-#pragma once
-
-#include "base/memory/scoped_ptr.h"
-#include "chrome/test/ui/ui_test.h"
-
-class TabProxy;
-
-namespace options2 {
-
-class OptionsUITest : public UITest {
- public:
-  OptionsUITest();
-
-  // Navigate to the settings tab and block until complete.
-  void NavigateToSettings(scoped_refptr<TabProxy> tab);
-
-  // Check navbar's existence.
-  void VerifyNavbar(scoped_refptr<TabProxy> tab);
-
-  // Verify that the page title is correct.
-  // The only guarantee we can make about the title of a settings tab is that
-  // it should contain IDS_SETTINGS_TITLE somewhere.
-  void VerifyTitle(scoped_refptr<TabProxy> tab);
-
-  // Check section headers in navbar.
-  // For ChromeOS, there should be 1 + 7:
-  //   Search, Basics, Personal, System, Internet, Under the Hood,
-  //   Users and Extensions.
-  // For other platforms, there should 1 + 4:
-  //   Search, Basics, Personal, Under the Hood and Extensions.
-  void VerifySections(scoped_refptr<TabProxy> tab);
-};
-
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_UITEST_H_