Remove deprecated service_manager_embedder_export.h

Use COMPONENT_EXPORT instead.

Change-Id: I8cebed14c3f4df0596fbc94edd9afd1840cf5603
Reviewed-on: https://chromium-review.googlesource.com/c/1370574Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615988}

services/service_manager/embedder/BUILD.gn

@@ -9,7 +9,6 @@ component("embedder") {
 
   sources = [
     "manifest_utils.cc",
-    "service_manager_embedder_export.h",
   ]
 
   # iOS embeds the Service Manager but does not use service_manager::Main() (and
@@ -76,7 +75,7 @@ component("embedder") {
     ]
   }
 
-  defines = [ "SERVICE_MANAGER_EMBEDDER_IMPL" ]
+  defines = [ "IS_SERVICE_MANAGER_EMBEDDER_IMPL" ]
 }
 
 component("embedder_switches") {
@@ -103,11 +102,6 @@ source_set("unittests") {
     "manifest_utils_unittest.cc",
   ]
 
-  # These headers are duplicated here so that they can remain private in the
-  # "embedder" target. See http://crbug.com/732993 for a way to make it
-  # unnecessary to do this.
-  sources += [ "service_manager_embedder_export.h" ]
-
   deps = [
     ":embedder",
     "//base",

services/service_manager/embedder/main.h

@@ -5,14 +5,14 @@
 #ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_MAIN_H_
 #define SERVICES_SERVICE_MANAGER_EMBEDDER_MAIN_H_
 
+#include "base/component_export.h"
 #include "build/build_config.h"
-#include "services/service_manager/embedder/service_manager_embedder_export.h"
 
 namespace service_manager {
 
 class MainDelegate;
 
-struct SERVICE_MANAGER_EMBEDDER_EXPORT MainParams {
+struct COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) MainParams {
   explicit MainParams(MainDelegate* delegate);
   ~MainParams();
 
@@ -26,7 +26,7 @@ struct SERVICE_MANAGER_EMBEDDER_EXPORT MainParams {
 
 // Main function which should be called as early as possible by any executable
 // embedding the service manager.
-int SERVICE_MANAGER_EMBEDDER_EXPORT Main(const MainParams& params);
+int COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) Main(const MainParams& params);
 
 }  // namespace service_manager
 

services/service_manager/embedder/main_delegate.h

@@ -8,12 +8,12 @@
 #include <memory>
 
 #include "base/callback_forward.h"
+#include "base/component_export.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/single_thread_task_runner.h"
 #include "mojo/core/embedder/configuration.h"
 #include "services/service_manager/background/background_service_manager.h"
 #include "services/service_manager/embedder/process_type.h"
-#include "services/service_manager/embedder/service_manager_embedder_export.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/mojom/service.mojom.h"
@@ -31,7 +31,7 @@ namespace service_manager {
 // An interface which must be implemented by Service Manager embedders to
 // control basic process initialization and shutdown, as well as early branching
 // to run specific types of subprocesses.
-class SERVICE_MANAGER_EMBEDDER_EXPORT MainDelegate {
+class COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) MainDelegate {
  public:
   // Extra parameters passed to MainDelegate::Initialize.
   struct InitializeParams {

services/service_manager/embedder/manifest_utils.h

@@ -5,16 +5,16 @@
 #ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_MANIFEST_UTILS_H_
 #define SERVICES_SERVICE_MANAGER_EMBEDDER_MANIFEST_UTILS_H_
 
+#include "base/component_export.h"
 #include "base/values.h"
-#include "services/service_manager/embedder/service_manager_embedder_export.h"
 
 namespace service_manager {
 
 // Merges |overlay| (if not null) into |manifest|.
 // Uses a strategy similar to base::DictionaryValue::MergeDictionary(), except
 // concatenates ListValue contents.
-void SERVICE_MANAGER_EMBEDDER_EXPORT
-MergeManifestWithOverlay(base::Value* manifest, base::Value* overlay);
+void COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER)
+    MergeManifestWithOverlay(base::Value* manifest, base::Value* overlay);
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_EMBEDDER_MANIFEST_UTILS_H_

services/service_manager/embedder/service_manager_embedder_export.h

-// Copyright 2017 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.
-
-#ifndef SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_EMBEDDER_EXPORT_H_
-#define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_EMBEDDER_EXPORT_H_
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(SERVICE_MANAGER_EMBEDDER_IMPL)
-#define SERVICE_MANAGER_EMBEDDER_EXPORT __declspec(dllexport)
-#else
-#define SERVICE_MANAGER_EMBEDDER_EXPORT __declspec(dllimport)
-#endif  // defined(SERVICE_MANAGER_EMBEDDER_IMPL)
-
-#else  // defined(WIN32)
-#if defined(SERVICE_MANAGER_EMBEDDER_IMPL)
-#define SERVICE_MANAGER_EMBEDDER_EXPORT __attribute__((visibility("default")))
-#else
-#define SERVICE_MANAGER_EMBEDDER_EXPORT
-#endif  // defined(SERVICE_MANAGER_EMBEDDER_IMPL)
-#endif
-
-#else  // defined(COMPONENT_BUILD)
-#define SERVICE_MANAGER_EMBEDDER_EXPORT
-#endif
-
-#endif  // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_EMBEDDER_EXPORT_H_

services/service_manager/embedder/set_process_title.h

@@ -5,7 +5,7 @@
 #ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_H_
 #define SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_H_
 
-#include "services/service_manager/embedder/service_manager_embedder_export.h"
+#include "base/component_export.h"
 
 namespace service_manager {
 
@@ -23,7 +23,7 @@ namespace service_manager {
 // makes the process name that shows up in "ps" etc. for the child processes
 // show as "exe" instead of "chrome" or something reasonable. This function
 // will try to fix it so the "effective" command line shows up instead.
-SERVICE_MANAGER_EMBEDDER_EXPORT
+COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER)
 void SetProcessTitleFromCommandLine(const char** main_argv);
 
 }  // namespace service_manager

services/service_manager/embedder/shared_file_util.h

@@ -9,12 +9,13 @@
 #include <string>
 
 #include "base/command_line.h"
+#include "base/component_export.h"
 #include "base/optional.h"
-#include "services/service_manager/embedder/service_manager_embedder_export.h"
 
 namespace service_manager {
 
-class SERVICE_MANAGER_EMBEDDER_EXPORT SharedFileSwitchValueBuilder final {
+class COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER)
+    SharedFileSwitchValueBuilder final {
  public:
   void AddEntry(const std::string& key_str, int key_id);
   const std::string& switch_value() const { return switch_value_; }
@@ -23,8 +24,9 @@ class SERVICE_MANAGER_EMBEDDER_EXPORT SharedFileSwitchValueBuilder final {
   std::string switch_value_;
 };
 
-SERVICE_MANAGER_EMBEDDER_EXPORT base::Optional<std::map<int, std::string>>
-ParseSharedFileSwitchValue(const std::string& value);
+COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER)
+base::Optional<std::map<int, std::string>> ParseSharedFileSwitchValue(
+    const std::string& value);
 
 }  // namespace service_manager
 

services/service_manager/sandbox/BUILD.gn

@@ -18,9 +18,6 @@ component("sandbox") {
     "sandbox_type.h",
     "switches.cc",
     "switches.h",
-
-    # Duplicated here to keep private.
-    "//services/service_manager/embedder/service_manager_embedder_export.h",
   ]
   defines = [ "SERVICE_MANAGER_SANDBOX_IMPL" ]
   public_deps = [