Revert of Add ARC++ specific fields to launch data for specific apps.

extensions/browser/api/app_runtime/app_runtime_api.cc

 // Copyright 2014 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 "extensions/browser/api/app_runtime/app_runtime_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
-#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "extensions/browser/entry_info.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/granted_file_entry.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/constants.h"
@@ skipping 110 matching lines @@
     const Extension* extension) {
   DispatchOnEmbedRequestedEventImpl(extension->id(), std::move(embed_app_data),
                                     context);
 }
 
 // static
 void AppRuntimeEventRouter::DispatchOnLaunchedEvent(
     BrowserContext* context,
     const Extension* extension,
     extensions::AppLaunchSource source,
-    std::unique_ptr<app_runtime::LaunchData> launch_data) {
-  if (!launch_data)
-    launch_data = base::MakeUnique<app_runtime::LaunchData>();
+    std::unique_ptr<app_runtime::ActionData> action_data) {
+  app_runtime::LaunchData launch_data;
+
   app_runtime::LaunchSource source_enum = GetLaunchSourceEnum(source);
   if (extensions::FeatureSwitch::trace_app_source()->IsEnabled()) {
-    launch_data->source = source_enum;
+    launch_data.source = source_enum;
   }
 
+  launch_data.action_data = std::move(action_data);
+
   DispatchOnLaunchedEventImpl(extension->id(), source_enum,
-                              launch_data->ToValue(), context);
+                              launch_data.ToValue(), context);
 }
 
 // static
 void AppRuntimeEventRouter::DispatchOnRestartedEvent(
     BrowserContext* context,
     const Extension* extension) {
   std::unique_ptr<base::ListValue> arguments(new base::ListValue());
   std::unique_ptr<Event> event(new Event(events::APP_RUNTIME_ON_RESTARTED,
                                          app_runtime::OnRestarted::kEventName,
                                          std::move(arguments)));
@@ skipping 60 matching lines @@
   launch_data.url.reset(new std::string(url.spec()));
   launch_data.referrer_url.reset(new std::string(referrer_url.spec()));
   if (extensions::FeatureSwitch::trace_app_source()->IsEnabled()) {
     launch_data.source = source_enum;
   }
   DispatchOnLaunchedEventImpl(extension->id(), source_enum,
                               launch_data.ToValue(), context);
 }
 
 }  // namespace extensions