Add a simple UI test for --app mode.

The --app browser launch code path was previously untested, which resulted in us shipping a release where it was broken.

BUG=47544
TEST=ui_tests

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

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

1 files changed, 28 insertions, 1 deletions

diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index 8efef73..eb66e13 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -9,6 +9,7 @@
 #include "base/test/test_file_util.h"
 #include "base/values.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/browser.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
@@ -245,7 +246,7 @@ class KioskModeTest : public UITest {
 };
 
 TEST_F(KioskModeTest, EnableKioskModeTest) {
-  // Load a dummy url.
+  // Load a local file.
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title1.html");
 
@@ -302,4 +303,30 @@ TEST_F(LaunchBrowserWithNonAsciiUserDatadir, TestNonAsciiUserDataDir) {
 }
 #endif  // defined(OS_WIN)
 
+class AppModeTest : public UITest {
+ public:
+  AppModeTest() {
+    // Load a local file.
+    FilePath test_file(test_data_directory_);
+    test_file = test_file.AppendASCII("title1.html");
+    GURL test_file_url(net::FilePathToFileURL(test_file));
+
+    launch_arguments_.AppendSwitchWithValue(switches::kApp,
+                                            test_file_url.spec());
+  }
+};
+
+TEST_F(AppModeTest, EnableAppModeTest) {
+  // Test that an application browser window loads correctly.
+
+  // Verify that the window is present.
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser.get());
+
+  // Verify the browser is an application.
+  Browser::Type type;
+  ASSERT_TRUE(browser->GetType(&type));
+  EXPECT_EQ(Browser::TYPE_APP, type);
+}
+
 }  // namespace