summaryrefslogtreecommitdiffstats
path: root/ash/shell_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 22:58:36 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 22:58:36 +0000
commitc39be8f0c897d5f57305e3a36b2a5f74ea15d3e1 (patch)
tree6bd0961a3987a0ab4585ffdb4120974b25e285ef /ash/shell_unittest.cc
parent481a4b7f34565ef087c8aa44c8e04f9f0e466b2d (diff)
downloadchromium_src-c39be8f0c897d5f57305e3a36b2a5f74ea15d3e1.zip
chromium_src-c39be8f0c897d5f57305e3a36b2a5f74ea15d3e1.tar.gz
chromium_src-c39be8f0c897d5f57305e3a36b2a5f74ea15d3e1.tar.bz2
Basic tests for extended desktop mode
BUG=123160 TEST=extended_desktop_unittests Review URL: https://chromiumcodereview.appspot.com/10536187 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
-rw-r--r--ash/shell_unittest.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index a5e7939..247a122 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -10,10 +10,8 @@
#include "ash/test/ash_test_base.h"
#include "ash/wm/root_window_layout_manager.h"
#include "ash/wm/shelf_layout_manager.h"
-#include "base/command_line.h"
#include "base/utf_string_conversions.h"
#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/gfx/size.h"
@@ -115,14 +113,7 @@ class ModalWindow : public views::WidgetDelegateView {
} // namespace
-class ShellTest : public test::AshTestBase {
- public:
- ShellTest() {}
- virtual ~ShellTest() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ShellTest);
-};
+typedef test::AshTestBase ShellTest;
TEST_F(ShellTest, CreateWindow) {
// Normal window should be created in default container.