Move LaunchContainer enum to extension_constants.h.

chrome/browser/apps/app_window_browsertest.cc

 // Copyright 2013 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 "apps/shell_window_geometry_cache.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
@@ skipping 114 matching lines @@
   ExtensionTestMessageListener launched_listener("Launched", true);
 
   content::WindowedNotificationObserver app_loaded_observer(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::NotificationService::AllSources());
 
   const extensions::Extension* extension = LoadExtension(
       test_data_dir_.AppendASCII("platform_apps").AppendASCII("window_api"));
   EXPECT_TRUE(extension);
 
-  OpenApplication(AppLaunchParams(
-      browser()->profile(), extension, extensions::LAUNCH_NONE, NEW_WINDOW));
+  OpenApplication(AppLaunchParams(browser()->profile(),
+                                  extension,
+                                  extensions::LAUNCH_CONTAINER_NONE,
+                                  NEW_WINDOW));
 
   ExtensionTestMessageListener geometry_listener("ListenGeometryChange", true);
 
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
   launched_listener.Reply("testRestoreAfterGeometryCacheChange");
 
   ASSERT_TRUE(geometry_listener.WaitUntilSatisfied());
 
   GeometryCacheChangeHelper geo_change_helper(
       ShellWindowGeometryCache::Get(browser()->profile()), extension->id(),
       // The next line has information that has to stay in sync with the app.
       "test-ps", gfx::Rect(200, 200, 200, 200));
 
   // This call will block until the shell window geometry cache will be changed.
   geo_change_helper.WaitForEntirelyChanged();
 
   ResultCatcher catcher;
   geometry_listener.Reply("");
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestSizeConstraints) {
   ASSERT_TRUE(RunAppWindowAPITest("testSizeConstraints")) << message_;
 }