Remove uses NON_EXPORTED_BASE now that it's a no-op.

CL generated by

   git grep -l NON_EXPORTED_BASE | xargs sed -i 's/NON_EXPORTED_BASE(\([^)]*\))/\1/g'
   git cl format

I'm not changing compiler_specific.h itself in this cl, to keep the revert
small if the subsequent removal of the actual macro should break something.

Bug: 752837
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_site_isolation;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I53d6460e592b91a173f7aa55dfdb05631e51e5f7
Reviewed-on: https://chromium-review.googlesource.com/614703
Reviewed-by: Brett Wilson <brettw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#494486}

android_webview/browser/parent_output_surface.h

@@ -11,7 +11,7 @@
 namespace android_webview {
 class AwRenderThreadContextProvider;
 
-class ParentOutputSurface : NON_EXPORTED_BASE(public cc::OutputSurface) {
+class ParentOutputSurface : public cc::OutputSurface {
  public:
   explicit ParentOutputSurface(
       scoped_refptr<AwRenderThreadContextProvider> context_provider);

ash/accelerators/accelerator_controller.h

@@ -37,9 +37,8 @@ class ExitWarningHandler;
 // AcceleratorController provides functions for registering or unregistering
 // global keyboard accelerators, which are handled earlier than any windows. It
 // also implements several handlers as an accelerator target.
-class ASH_EXPORT AcceleratorController
-    : public ui::AcceleratorTarget,
-      NON_EXPORTED_BASE(public mojom::AcceleratorController) {
+class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget,
+                                         public mojom::AcceleratorController {
  public:
   AcceleratorController(AcceleratorControllerDelegate* delegate,
                         ui::AcceleratorManagerDelegate* manager_delegate);

ash/accelerators/accelerator_delegate.h

@@ -16,8 +16,7 @@ namespace ash {
 
 class AcceleratorRouter;
 
-class ASH_EXPORT AcceleratorDelegate
-    : NON_EXPORTED_BASE(public ::wm::AcceleratorDelegate) {
+class ASH_EXPORT AcceleratorDelegate : public ::wm::AcceleratorDelegate {
  public:
   AcceleratorDelegate();
   ~AcceleratorDelegate() override;

ash/ime/ime_controller.h

@@ -21,8 +21,7 @@ namespace ash {
 
 // Connects ash IME users (e.g. the system tray) to the IME implementation,
 // which might live in Chrome browser or in a separate mojo service.
-class ASH_EXPORT ImeController
-    : public NON_EXPORTED_BASE(mojom::ImeController) {
+class ASH_EXPORT ImeController : public mojom::ImeController {
  public:
   ImeController();
   ~ImeController() override;

ash/login/lock_screen_controller.h

@@ -17,8 +17,7 @@ namespace ash {
 // LockScreenClient, which we will dispatch to if one has been provided to us.
 // This could send requests to LockScreenClient and also handle requests from
 // LockScreenClient through mojo.
-class ASH_EXPORT LockScreenController
-    : NON_EXPORTED_BASE(public mojom::LockScreen) {
+class ASH_EXPORT LockScreenController : public mojom::LockScreen {
  public:
   using OnShownCallback = base::OnceCallback<void(bool did_show)>;
 

ash/session/session_controller.h

@@ -29,8 +29,7 @@ class SessionObserver;
 // Implements mojom::SessionController to cache session related info such as
 // session state, meta data about user sessions to support synchronous
 // queries for ash.
-class ASH_EXPORT SessionController
-    : NON_EXPORTED_BASE(public mojom::SessionController) {
+class ASH_EXPORT SessionController : public mojom::SessionController {
  public:
   SessionController();
   ~SessionController() override;

ash/shutdown_controller.h

@@ -17,8 +17,7 @@ enum class ShutdownReason;
 
 // Handles actual device shutdown by making requests to powerd over D-Bus.
 // Caches the DeviceRebootOnShutdown device policy sent from Chrome over mojo.
-class ASH_EXPORT ShutdownController
-    : NON_EXPORTED_BASE(public mojom::ShutdownController) {
+class ASH_EXPORT ShutdownController : public mojom::ShutdownController {
  public:
   ShutdownController();
   ~ShutdownController() override;

ash/system/night_light/night_light_controller.h

@@ -24,9 +24,8 @@ namespace ash {
 
 // Controls the NightLight feature that adjusts the color temperature of the
 // screen.
-class ASH_EXPORT NightLightController
-    : public NON_EXPORTED_BASE(mojom::NightLightController),
-      public ShellObserver {
+class ASH_EXPORT NightLightController : public mojom::NightLightController,
+                                        public ShellObserver {
  public:
   using ScheduleType = mojom::NightLightController::ScheduleType;
 

ash/system/tray/system_tray_controller.h

@@ -23,8 +23,7 @@ namespace ash {
 //
 // TODO: Consider renaming this to SystemTrayClient or renaming the current
 // SystemTray to SystemTrayView and making this class SystemTray.
-class ASH_EXPORT SystemTrayController
-    : NON_EXPORTED_BASE(public mojom::SystemTray) {
+class ASH_EXPORT SystemTrayController : public mojom::SystemTray {
  public:
   SystemTrayController();
   ~SystemTrayController() override;

ash/tray_action/tray_action.h

@@ -24,7 +24,7 @@ class TrayActionObserver;
 // Currently, only single action is supported - creating new note on the lock
 // screen - Chrome handles this action by launching an app (if any) that is
 // registered as a lock screen enabled action handler for the new note action.
-class ASH_EXPORT TrayAction : public NON_EXPORTED_BASE(mojom::TrayAction) {
+class ASH_EXPORT TrayAction : public mojom::TrayAction {
  public:
   TrayAction();
   ~TrayAction() override;

ash/wallpaper/wallpaper_controller.h

@@ -49,13 +49,13 @@ class WallpaperControllerObserver;
 //     hide the user desktop and move it to unlocked container when session
 //     state is ACTIVE;
 class ASH_EXPORT WallpaperController
-    : public NON_EXPORTED_BASE(mojom::WallpaperController),
+    : public mojom::WallpaperController,
       public WindowTreeHostManager::Observer,
       public ShellObserver,
       public wallpaper::WallpaperResizerObserver,
       public wallpaper::WallpaperColorCalculatorObserver,
       public SessionObserver,
-      public NON_EXPORTED_BASE(ui::CompositorLockClient) {
+      public ui::CompositorLockClient {
  public:
   enum WallpaperMode { WALLPAPER_NONE, WALLPAPER_IMAGE };
 

ash/wm/tablet_mode/tablet_mode_controller.h

@@ -50,7 +50,7 @@ class TabletModeWindowManagerTest;
 class ASH_EXPORT TabletModeController
     : public chromeos::AccelerometerReader::Observer,
       public chromeos::PowerManagerClient::Observer,
-      NON_EXPORTED_BASE(public mojom::TouchViewManager),
+      public mojom::TouchViewManager,
       public ShellObserver,
       public WindowTreeHostManager::Observer,
       public SessionObserver {

cc/animation/animation_events.h

@@ -47,8 +47,7 @@ struct CC_ANIMATION_EXPORT AnimationEvent {
   std::unique_ptr<AnimationCurve> curve;
 };
 
-class CC_ANIMATION_EXPORT AnimationEvents
-    : public NON_EXPORTED_BASE(MutatorEvents) {
+class CC_ANIMATION_EXPORT AnimationEvents : public MutatorEvents {
  public:
   AnimationEvents();
 

cc/animation/animation_host.h

@@ -43,8 +43,7 @@ enum class ThreadInstance { MAIN, IMPL };
 // (PushPropertiesTo).
 // An AnimationHost talks to its correspondent LayerTreeHost via
 // MutatorHostClient interface.
-class CC_ANIMATION_EXPORT AnimationHost
-    : public NON_EXPORTED_BASE(MutatorHost) {
+class CC_ANIMATION_EXPORT AnimationHost : public MutatorHost {
  public:
   using ElementToAnimationsMap =
       std::unordered_map<ElementId,

cc/blink/web_compositor_support_impl.h

@@ -15,7 +15,7 @@
 namespace cc_blink {
 
 class CC_BLINK_EXPORT WebCompositorSupportImpl
-    : public NON_EXPORTED_BASE(blink::WebCompositorSupport) {
+    : public blink::WebCompositorSupport {
  public:
   WebCompositorSupportImpl();
   ~WebCompositorSupportImpl() override;

cc/blink/web_layer_impl.h

@@ -35,7 +35,7 @@ class Layer;
 
 namespace cc_blink {
 
-class CC_BLINK_EXPORT WebLayerImpl : public NON_EXPORTED_BASE(blink::WebLayer) {
+class CC_BLINK_EXPORT WebLayerImpl : public blink::WebLayer {
  public:
   WebLayerImpl();
   explicit WebLayerImpl(scoped_refptr<cc::Layer>);

cc/layers/picture_layer_impl.h

@@ -27,9 +27,8 @@ class AppendQuadsData;
 class MicroBenchmarkImpl;
 class Tile;
 
-class CC_EXPORT PictureLayerImpl
-    : public LayerImpl,
-      NON_EXPORTED_BASE(public PictureLayerTilingClient) {
+class CC_EXPORT PictureLayerImpl : public LayerImpl,
+                                   public PictureLayerTilingClient {
  public:
   static std::unique_ptr<PictureLayerImpl>
   Create(LayerTreeImpl* tree_impl, int id, Layer::LayerMaskType mask_type) {

cc/trees/layer_tree_host.h

@@ -65,9 +65,8 @@ class UIResourceManager;
 struct RenderingStats;
 struct ScrollAndScaleSet;
 
-class CC_EXPORT LayerTreeHost
-    : public NON_EXPORTED_BASE(viz::SurfaceReferenceOwner),
-      public NON_EXPORTED_BASE(MutatorHostClient) {
+class CC_EXPORT LayerTreeHost : public viz::SurfaceReferenceOwner,
+                                public MutatorHostClient {
  public:
   struct CC_EXPORT InitParams {
     LayerTreeHostClient* client = nullptr;

cc/trees/proxy_impl.h

@@ -22,8 +22,8 @@ class ProxyMain;
 // This class aggregates all the interactions that the main side of the
 // compositor needs to have with the impl side.
 // The class is created and lives on the impl thread.
-class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient),
-                            public NON_EXPORTED_BASE(SchedulerClient) {
+class CC_EXPORT ProxyImpl : public LayerTreeHostImplClient,
+                            public SchedulerClient {
  public:
   ProxyImpl(base::WeakPtr<ProxyMain> proxy_main_weak_ptr,
             LayerTreeHost* layer_tree_host,

cc/trees/single_thread_proxy.h

@@ -28,7 +28,7 @@ class LayerTreeHost;
 class LayerTreeHostSingleThreadClient;
 
 class CC_EXPORT SingleThreadProxy : public Proxy,
-                                    NON_EXPORTED_BASE(LayerTreeHostImplClient),
+                                    LayerTreeHostImplClient,
                                     public SchedulerClient {
  public:
   static std::unique_ptr<Proxy> Create(

chrome/browser/chromeos/night_light/night_light_client.h

@@ -24,8 +24,7 @@ class URLRequestContextGetter;
 
 // Periodically requests the IP-based geolocation and provides it to the
 // NightLightController running in ash.
-class NightLightClient
-    : public NON_EXPORTED_BASE(ash::mojom::NightLightClient) {
+class NightLightClient : public ash::mojom::NightLightClient {
  public:
   NightLightClient(net::URLRequestContextGetter* url_context_getter);
   ~NightLightClient() override;

chrome/browser/media/router/browser_presentation_connection_proxy.h

@@ -40,7 +40,7 @@ class MediaRouter;
 // |route_| is closed or terminated, instance of this class will be destroyed.
 
 class BrowserPresentationConnectionProxy
-    : public NON_EXPORTED_BASE(blink::mojom::PresentationConnection),
+    : public blink::mojom::PresentationConnection,
       public RouteMessageObserver {
  public:
   using OnMessageCallback = base::OnceCallback<void(bool)>;

chrome/browser/media/router/test_helper.h

@@ -83,7 +83,7 @@ class MockMediaRoutesObserver : public MediaRoutesObserver {
 };
 
 class MockPresentationConnectionProxy
-    : public NON_EXPORTED_BASE(blink::mojom::PresentationConnection) {
+    : public blink::mojom::PresentationConnection {
  public:
   // PresentationConnectionMessage is move-only.
   // TODO(crbug.com/729950): Use MOCK_METHOD directly once GMock gets the

chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h

@@ -20,8 +20,7 @@ namespace storage {
 class FileSystemContext;
 }
 
-class MTPFileStreamReader
-    : public NON_EXPORTED_BASE(storage::FileStreamReader) {
+class MTPFileStreamReader : public storage::FileStreamReader {
  public:
   MTPFileStreamReader(storage::FileSystemContext* file_system_context,
                       const storage::FileSystemURL& url,

chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h

@@ -15,8 +15,7 @@
 #include "storage/browser/fileapi/file_stream_reader.h"
 
 // Wraps a source FileStreamReader with a readahead buffer.
-class ReadaheadFileStreamReader
-    : public NON_EXPORTED_BASE(storage::FileStreamReader) {
+class ReadaheadFileStreamReader : public storage::FileStreamReader {
  public:
   // Takes ownership of |source|.
   explicit ReadaheadFileStreamReader(storage::FileStreamReader* source);

chrome/browser/sync_file_system/local/syncable_file_system_operation.h

@@ -27,8 +27,7 @@ namespace sync_file_system {
 class SyncableFileOperationRunner;
 
 // A wrapper class of FileSystemOperation for syncable file system.
-class SyncableFileSystemOperation
-    : public NON_EXPORTED_BASE(storage::FileSystemOperation) {
+class SyncableFileSystemOperation : public storage::FileSystemOperation {
  public:
   ~SyncableFileSystemOperation() override;
 

components/exo/shell_surface.h

@@ -57,7 +57,7 @@ class ShellSurface : public SurfaceTreeHost,
                      public ash::wm::WindowStateObserver,
                      public WMHelper::ActivationObserver,
                      public WMHelper::DisplayConfigurationObserver,
-                     NON_EXPORTED_BASE(public ui::CompositorLockClient) {
+                     public ui::CompositorLockClient {
  public:
   enum class BoundsMode { SHELL, CLIENT, FIXED };
 

components/invalidation/impl/p2p_invalidator.h

@@ -86,9 +86,8 @@ class INVALIDATION_EXPORT P2PNotificationData {
   ObjectIdInvalidationMap invalidation_map_;
 };
 
-class INVALIDATION_EXPORT P2PInvalidator
-    : public Invalidator,
-      public NON_EXPORTED_BASE(notifier::PushClientObserver) {
+class INVALIDATION_EXPORT P2PInvalidator : public Invalidator,
+                                           public notifier::PushClientObserver {
  public:
   // The |send_notification_target| parameter was added to allow us to send
   // self-notifications in some cases, but not others.  The value should be

components/invalidation/impl/push_client_channel.h

@@ -26,7 +26,7 @@ namespace syncer {
 // routes messages through a PushClient.
 class INVALIDATION_EXPORT PushClientChannel
     : public SyncNetworkChannel,
-      public NON_EXPORTED_BASE(notifier::PushClientObserver) {
+      public notifier::PushClientObserver {
  public:
   // |push_client| is guaranteed to be destroyed only when this object
   // is destroyed.

components/invalidation/impl/sync_invalidation_listener.h

@@ -33,7 +33,7 @@ class RegistrationManager;
 // SyncInvalidationListener is not thread-safe and lives on the sync
 // thread.
 class INVALIDATION_EXPORT SyncInvalidationListener
-    : public NON_EXPORTED_BASE(invalidation::InvalidationListener),
+    : public invalidation::InvalidationListener,
       public StateWriter,
       public SyncNetworkChannel::Observer,
       public AckHandler {

components/invalidation/impl/sync_system_resources.h

@@ -85,7 +85,7 @@ class SyncInvalidationScheduler : public invalidation::Scheduler {
 // Implementation of particular network protocol should implement
 // SendMessage and call NotifyStateChange and DeliverIncomingMessage.
 class INVALIDATION_EXPORT SyncNetworkChannel
-    : public NON_EXPORTED_BASE(invalidation::NetworkChannel) {
+    : public invalidation::NetworkChannel {
  public:
   class Observer {
    public:
@@ -211,7 +211,7 @@ class SyncStorage : public invalidation::Storage {
 };
 
 class INVALIDATION_EXPORT SyncSystemResources
-    : public NON_EXPORTED_BASE(invalidation::SystemResources) {
+    : public invalidation::SystemResources {
  public:
   SyncSystemResources(SyncNetworkChannel* sync_network_channel,
                       StateWriter* state_writer);

components/keyed_service/core/keyed_service_base_factory.h

@@ -28,8 +28,7 @@ class PrefRegistrySyncable;
 //
 // This object describes general dependency management between factories while
 // direct subclasses react to lifecycle events and implement memory management.
-class KEYED_SERVICE_EXPORT KeyedServiceBaseFactory
-    : NON_EXPORTED_BASE(public DependencyNode) {
+class KEYED_SERVICE_EXPORT KeyedServiceBaseFactory : public DependencyNode {
  public:
 #ifndef NDEBUG
   // Returns our name. We don't keep track of this in release mode.

components/prefs/pref_notifier_impl.h

@@ -22,8 +22,7 @@
 class PrefService;
 
 // The PrefNotifier implementation used by the PrefService.
-class COMPONENTS_PREFS_EXPORT PrefNotifierImpl
-    : public NON_EXPORTED_BASE(PrefNotifier) {
+class COMPONENTS_PREFS_EXPORT PrefNotifierImpl : public PrefNotifier {
  public:
   PrefNotifierImpl();
   explicit PrefNotifierImpl(PrefService* pref_service);

components/ui_devtools/devtools_server.h

@@ -20,8 +20,7 @@
 
 namespace ui_devtools {
 
-class UI_DEVTOOLS_EXPORT UiDevToolsServer
-    : public NON_EXPORTED_BASE(net::HttpServer::Delegate) {
+class UI_DEVTOOLS_EXPORT UiDevToolsServer : public net::HttpServer::Delegate {
  public:
   ~UiDevToolsServer() override;
 

components/viz/common/gpu/in_process_context_provider.h

@@ -33,8 +33,7 @@ class GrContextForGLES2Interface;
 
 namespace viz {
 
-class VIZ_COMMON_EXPORT InProcessContextProvider
-    : public NON_EXPORTED_BASE(ContextProvider) {
+class VIZ_COMMON_EXPORT InProcessContextProvider : public ContextProvider {
  public:
   InProcessContextProvider(
       scoped_refptr<gpu::InProcessCommandBuffer::Service> service,

components/viz/common/surfaces/sequence_surface_reference_factory.h

@@ -13,7 +13,7 @@ namespace viz {
 
 // A surface reference factory that uses SurfaceSequence.
 class VIZ_COMMON_EXPORT SequenceSurfaceReferenceFactory
-    : public NON_EXPORTED_BASE(SurfaceReferenceFactory) {
+    : public SurfaceReferenceFactory {
  public:
   SequenceSurfaceReferenceFactory() = default;
 

components/viz/common/surfaces/stub_surface_reference_factory.h

@@ -15,7 +15,7 @@ namespace viz {
 // TODO(kylechar): Delete this class and all usage of
 // SurfaceReferenceFactory when surface references are enabled by default.
 class VIZ_COMMON_EXPORT StubSurfaceReferenceFactory
-    : public NON_EXPORTED_BASE(SurfaceReferenceFactory) {
+    : public SurfaceReferenceFactory {
  public:
   StubSurfaceReferenceFactory() = default;
 

components/viz/host/host_frame_sink_manager.h

@@ -41,8 +41,8 @@ class HostFrameSinkManagerTest;
 // UI thread. Manages frame sinks and is intended to replace all usage of
 // FrameSinkManagerImpl.
 class VIZ_HOST_EXPORT HostFrameSinkManager
-    : public NON_EXPORTED_BASE(mojom::FrameSinkManagerClient),
-      public NON_EXPORTED_BASE(CompositorFrameSinkSupportManager) {
+    : public mojom::FrameSinkManagerClient,
+      public CompositorFrameSinkSupportManager {
  public:
   HostFrameSinkManager();
   ~HostFrameSinkManager() override;