summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-23 23:35:31 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-23 23:35:31 +0000
commitb65bdda36c548cd680eecbbfcfbd482b740e2eb3 (patch)
treef904be7f7f8db20269dbe2c76b28e325ec04bd28 /ash/test
parentff00968f75fd1a82532b0009f535310db5a9556c (diff)
downloadchromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.zip
chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.gz
chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.bz2
Move last few files -> ash
http://crbug.com/108457 TEST=none TBR=sky Review URL: http://codereview.chromium.org/9036011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/ash_unittests.cc9
-rw-r--r--ash/test/aura_shell_test_base.cc2
-rw-r--r--ash/test/test_shell_delegate.h2
3 files changed, 11 insertions, 2 deletions
diff --git a/ash/test/ash_unittests.cc b/ash/test/ash_unittests.cc
new file mode 100644
index 0000000..ad39e19
--- /dev/null
+++ b/ash/test/ash_unittests.cc
@@ -0,0 +1,9 @@
+// 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.
+
+#include "ash/test/test_suite.h"
+
+int main(int argc, char** argv) {
+ return aura_shell::test::AuraShellTestSuite(argc, argv).Run();
+}
diff --git a/ash/test/aura_shell_test_base.cc b/ash/test/aura_shell_test_base.cc
index 608f76a..6b99331 100644
--- a/ash/test/aura_shell_test_base.cc
+++ b/ash/test/aura_shell_test_base.cc
@@ -4,8 +4,8 @@
#include "ash/test/aura_shell_test_base.h"
+#include "ash/shell.h"
#include "ash/test/test_shell_delegate.h"
-#include "ui/aura_shell/shell.h"
namespace aura_shell {
namespace test {
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 6d922ca..1acc6a0 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -6,8 +6,8 @@
#define ASH_TEST_TEST_SHELL_DELEGATE_H_
#pragma once
+#include "ash/shell_delegate.h"
#include "base/compiler_specific.h"
-#include "ui/aura_shell/shell_delegate.h"
namespace aura_shell {
namespace test {