Revert of CL 722703002 due to build breakage

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

 // Copyright (c) 2012 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 "base/auto_reset.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_folder_finder.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/media_galleries/media_galleries_scan_result_controller.h"
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
 #include "chrome/browser/media_galleries/media_scan_manager.h"
-#include "chrome/browser/ui/extensions/app_launch_params.h"
-#include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/test/result_catcher.h"
 #include "media/base/test_data_util.h"
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 #include "chrome/common/media_galleries/picasa_test_util.h"
 #include "chrome/common/media_galleries/picasa_types.h"
 #include "chrome/common/media_galleries/pmp_test_util.h"
 #endif
@@ skipping 423 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiTest, SendFilesystem) {
   RemoveAllGalleries();
   MakeSingleFakeGallery(NULL);
 
   const extensions::Extension* extension = LoadExtension(app_dir());
   ASSERT_TRUE(extension);
 
   extensions::ResultCatcher catcher;
-  AppLaunchParams params(browser()->profile(), extension,
-                         extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
-                         extensions::SOURCE_UNTRACKED);
+  AppLaunchParams params(browser()->profile(),
+                         extension,
+                         extensions::LAUNCH_CONTAINER_NONE,
+                         NEW_WINDOW);
   params.command_line = *CommandLine::ForCurrentProcess();
   OpenApplication(params);
 
   bool result = true;
   if (!catcher.GetNextResult()) {
     message_ = catcher.message();
     result = false;
   }
   content::RunAllPendingInMessageLoop();  // avoid race on exit in registry.
   ASSERT_TRUE(result) << message_;
@@ skipping 182 matching lines @@
 
   base::ListValue custom_args;
 #if defined(USE_PROPRIETARY_CODECS)
   custom_args.AppendBoolean(true);
 #else
   custom_args.AppendBoolean(false);
 #endif
   ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
       << message_;
 }