Remove base_export.h

This mucked up all the formatting alignment, but I'm going to leave it wrong in
this CL and then globally clang-format in the next one to keep the changes
separate.

Change-Id: I53c836a83d26edcae9b97831844f7a6b350cfd14
Reviewed-on: https://gn-review.googlesource.com/1624
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Brett Wilson <brettw@chromium.org>
diff --git a/base/win/com_init_check_hook.h b/base/win/com_init_check_hook.h
index 3f1fbcd..6681da1 100644
--- a/base/win/com_init_check_hook.h
+++ b/base/win/com_init_check_hook.h
@@ -5,7 +5,6 @@
 #ifndef BASE_WIN_COM_INIT_CHECK_HOOK_H_
 #define BASE_WIN_COM_INIT_CHECK_HOOK_H_
 
-#include "base/base_export.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build_config.h"
@@ -28,7 +27,7 @@
 // COM to be initialized and only works if COM_INIT_CHECK_HOOK_ENABLED is
 // defined. Care should be taken if this is instantiated with multiple threads
 // running as the hotpatch does not apply atomically.
-class BASE_EXPORT ComInitCheckHook {
+class ComInitCheckHook {
  public:
   ComInitCheckHook();
   ~ComInitCheckHook();
diff --git a/base/win/com_init_util.h b/base/win/com_init_util.h
index be5a1b4..9d47099 100644
--- a/base/win/com_init_util.h
+++ b/base/win/com_init_util.h
@@ -5,7 +5,6 @@
 #ifndef BASE_WIN_COM_INIT_UTIL_H_
 #define BASE_WIN_COM_INIT_UTIL_H_
 
-#include "base/base_export.h"
 #include "base/logging.h"
 
 namespace base {
@@ -24,11 +23,11 @@
 
 // DCHECKs if COM is not initialized on this thread as an STA or MTA.
 // |message| is optional and is used for the DCHECK if specified.
-BASE_EXPORT void AssertComInitialized(const char* message = nullptr);
+void AssertComInitialized(const char* message = nullptr);
 
 // DCHECKs if |apartment_type| is not the same as the current thread's apartment
 // type.
-BASE_EXPORT void AssertComApartmentType(ComApartmentType apartment_type);
+void AssertComApartmentType(ComApartmentType apartment_type);
 
 #else   // DCHECK_IS_ON()
 inline void AssertComInitialized() {}
diff --git a/base/win/core_winrt_util.h b/base/win/core_winrt_util.h
index c86aed6..4698f78 100644
--- a/base/win/core_winrt_util.h
+++ b/base/win/core_winrt_util.h
@@ -10,7 +10,6 @@
 #include <roapi.h>
 #include <windef.h>
 
-#include "base/base_export.h"
 #include "base/strings/string16.h"
 #include "base/win/scoped_hstring.h"
 
@@ -21,20 +20,20 @@
 // Windows 7. Loads functions dynamically at runtime to prevent library
 // dependencies.
 
-BASE_EXPORT bool ResolveCoreWinRTDelayload();
+bool ResolveCoreWinRTDelayload();
 
 // The following stubs are provided for when component build is enabled, in
 // order to avoid the propagation of delay-loading CoreWinRT to other modules.
 
-BASE_EXPORT HRESULT RoInitialize(RO_INIT_TYPE init_type);
+HRESULT RoInitialize(RO_INIT_TYPE init_type);
 
-BASE_EXPORT void RoUninitialize();
+void RoUninitialize();
 
-BASE_EXPORT HRESULT RoGetActivationFactory(HSTRING class_id,
+HRESULT RoGetActivationFactory(HSTRING class_id,
                                            const IID& iid,
                                            void** out_factory);
 
-BASE_EXPORT HRESULT RoActivateInstance(HSTRING class_id,
+HRESULT RoActivateInstance(HSTRING class_id,
                                        IInspectable** instance);
 
 // Retrieves an activation factory for the type specified.
diff --git a/base/win/enum_variant.h b/base/win/enum_variant.h
index e27afcd..b61fc8f 100644
--- a/base/win/enum_variant.h
+++ b/base/win/enum_variant.h
@@ -15,7 +15,7 @@
 namespace win {
 
 // A simple implementation of IEnumVARIANT.
-class BASE_EXPORT EnumVariant
+class EnumVariant
   : public IEnumVARIANT,
     public IUnknownImpl {
  public:
diff --git a/base/win/event_trace_controller.h b/base/win/event_trace_controller.h
index 2e32b4c..17b82bc 100644
--- a/base/win/event_trace_controller.h
+++ b/base/win/event_trace_controller.h
@@ -26,7 +26,6 @@
 #include <stddef.h>
 #include <string>
 
-#include "base/base_export.h"
 #include "base/macros.h"
 
 namespace base {
@@ -35,7 +34,7 @@
 // Utility class to make it easier to work with EVENT_TRACE_PROPERTIES.
 // The EVENT_TRACE_PROPERTIES structure contains information about an
 // event tracing session.
-class BASE_EXPORT EtwTraceProperties {
+class EtwTraceProperties {
  public:
   EtwTraceProperties();
 
@@ -85,7 +84,7 @@
 // This class implements an ETW controller, which knows how to start and
 // stop event tracing sessions, as well as controlling ETW provider
 // log levels and enable bit masks under the session.
-class BASE_EXPORT EtwTraceController {
+class EtwTraceController {
  public:
   EtwTraceController();
   ~EtwTraceController();
diff --git a/base/win/event_trace_provider.h b/base/win/event_trace_provider.h
index d550dd6..321f539 100644
--- a/base/win/event_trace_provider.h
+++ b/base/win/event_trace_provider.h
@@ -15,7 +15,6 @@
 
 #include <limits>
 
-#include "base/base_export.h"
 #include "base/macros.h"
 
 namespace base {
@@ -90,7 +89,7 @@
 // a particular trace level, and whether particular enable flags are set,
 // before other resources are consumed to generate and issue the log
 // messages themselves.
-class BASE_EXPORT EtwTraceProvider {
+class EtwTraceProvider {
  public:
   // Creates an event trace provider identified by provider_name, which
   // will be the name registered with Event Tracing for Windows (ETW).
diff --git a/base/win/iat_patch_function.h b/base/win/iat_patch_function.h
index 86ad295..30f0ab9 100644
--- a/base/win/iat_patch_function.h
+++ b/base/win/iat_patch_function.h
@@ -7,7 +7,6 @@
 
 #include <windows.h>
 
-#include "base/base_export.h"
 #include "base/macros.h"
 
 namespace base {
@@ -20,7 +19,7 @@
 // This is the case when, for example, we want to intercept
 // CertDuplicateCertificateContext function (exported from crypt32.dll) called
 // by wininet.dll.
-class BASE_EXPORT IATPatchFunction {
+class IATPatchFunction {
  public:
   IATPatchFunction();
   ~IATPatchFunction();
diff --git a/base/win/iunknown_impl.h b/base/win/iunknown_impl.h
index b7de205..60f2403 100644
--- a/base/win/iunknown_impl.h
+++ b/base/win/iunknown_impl.h
@@ -8,14 +8,13 @@
 #include <unknwn.h>
 
 #include "base/atomic_ref_count.h"
-#include "base/base_export.h"
 #include "base/compiler_specific.h"
 
 namespace base {
 namespace win {
 
 // IUnknown implementation for other classes to derive from.
-class BASE_EXPORT IUnknownImpl : public IUnknown {
+class IUnknownImpl : public IUnknown {
  public:
   IUnknownImpl();
 
diff --git a/base/win/patch_util.h b/base/win/patch_util.h
index 035fb83..02ac72c 100644
--- a/base/win/patch_util.h
+++ b/base/win/patch_util.h
@@ -7,7 +7,6 @@
 
 #include <windows.h>
 
-#include "base/base_export.h"
 
 namespace base {
 namespace win {
@@ -16,7 +15,7 @@
 // Copies |length| bytes from |source| to |destination|, temporarily setting
 // |destination| to writable. Returns a Windows error code or NO_ERROR if
 // successful.
-BASE_EXPORT DWORD ModifyCode(void* destination, const void* source, int length);
+DWORD ModifyCode(void* destination, const void* source, int length);
 
 }  // namespace internal
 }  // namespace win
diff --git a/base/win/process_startup_helper.h b/base/win/process_startup_helper.h
index f633dda..2f19ac9 100644
--- a/base/win/process_startup_helper.h
+++ b/base/win/process_startup_helper.h
@@ -5,7 +5,6 @@
 #ifndef BASE_WIN_PROCESS_STARTUP_HELPER_H_
 #define BASE_WIN_PROCESS_STARTUP_HELPER_H_
 
-#include "base/base_export.h"
 
 namespace base {
 
@@ -15,10 +14,10 @@
 
 // Register the invalid param handler and pure call handler to be able to
 // notify breakpad when it happens.
-BASE_EXPORT void RegisterInvalidParamHandler();
+void RegisterInvalidParamHandler();
 
 // Sets up the CRT's debugging macros to output to stdout.
-BASE_EXPORT void SetupCRT(const CommandLine& command_line);
+void SetupCRT(const CommandLine& command_line);
 
 }  // namespace win
 }  // namespace base
diff --git a/base/win/registry.h b/base/win/registry.h
index db016bf..413ee7a 100644
--- a/base/win/registry.h
+++ b/base/win/registry.h
@@ -10,7 +10,6 @@
 #include <vector>
 #include "base/win/windows_types.h"
 
-#include "base/base_export.h"
 #include "base/macros.h"
 #include "base/win/scoped_handle.h"
 
@@ -26,7 +25,7 @@
 //    is not touched in case of failure.
 //  * Functions returning LONG indicate success as ERROR_SUCCESS or an
 //    error as a (non-zero) win32 error code.
-class BASE_EXPORT RegKey {
+class RegKey {
  public:
   RegKey();
   explicit RegKey(HKEY key);
@@ -143,7 +142,7 @@
 };
 
 // Iterates the entries found in a particular folder on the registry.
-class BASE_EXPORT RegistryValueIterator {
+class RegistryValueIterator {
  public:
   // Constructs a Registry Value Iterator with default WOW64 access.
   RegistryValueIterator(HKEY root_key, const wchar_t* folder_key);
@@ -196,7 +195,7 @@
   DISALLOW_COPY_AND_ASSIGN(RegistryValueIterator);
 };
 
-class BASE_EXPORT RegistryKeyIterator {
+class RegistryKeyIterator {
  public:
   // Constructs a Registry Key Iterator with default WOW64 access.
   RegistryKeyIterator(HKEY root_key, const wchar_t* folder_key);
diff --git a/base/win/resource_util.h b/base/win/resource_util.h
index 00687b9..3e6b145 100644
--- a/base/win/resource_util.h
+++ b/base/win/resource_util.h
@@ -11,7 +11,6 @@
 #include <windows.h>
 #include <stddef.h>
 
-#include "base/base_export.h"
 
 namespace base {
 namespace win {
@@ -19,7 +18,7 @@
 // Function for getting a data resource of the specified |resource_type| from
 // a dll.  Some resources are optional, especially in unit tests, so this
 // returns false but doesn't raise an error if the resource can't be loaded.
-bool BASE_EXPORT GetResourceFromModule(HMODULE module,
+bool GetResourceFromModule(HMODULE module,
                                        int resource_id,
                                        LPCTSTR resource_type,
                                        void** data,
@@ -28,7 +27,7 @@
 // Function for getting a data resource (BINDATA) from a dll.  Some
 // resources are optional, especially in unit tests, so this returns false
 // but doesn't raise an error if the resource can't be loaded.
-bool BASE_EXPORT GetDataResourceFromModule(HMODULE module,
+bool GetDataResourceFromModule(HMODULE module,
                                            int resource_id,
                                            void** data,
                                            size_t* length);
diff --git a/base/win/scoped_bstr.h b/base/win/scoped_bstr.h
index 2109c20..02f73ed 100644
--- a/base/win/scoped_bstr.h
+++ b/base/win/scoped_bstr.h
@@ -9,7 +9,6 @@
 #include <oleauto.h>
 #include <stddef.h>
 
-#include "base/base_export.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -19,7 +18,7 @@
 
 // Manages a BSTR string pointer.
 // The class interface is based on unique_ptr.
-class BASE_EXPORT ScopedBstr {
+class ScopedBstr {
  public:
   ScopedBstr() : bstr_(NULL) {
   }
diff --git a/base/win/scoped_handle.h b/base/win/scoped_handle.h
index 010e8a4..7c63bb7 100644
--- a/base/win/scoped_handle.h
+++ b/base/win/scoped_handle.h
@@ -7,7 +7,6 @@
 
 #include "base/win/windows_types.h"
 
-#include "base/base_export.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ -111,7 +110,7 @@
   typedef HANDLE Handle;
 
   // Closes the handle.
-  static bool BASE_EXPORT CloseHandle(HANDLE handle);
+  static bool CloseHandle(HANDLE handle);
 
   // Returns true if the handle value is valid.
   static bool IsHandleValid(HANDLE handle) {
@@ -142,7 +141,7 @@
 };
 
 // Performs actual run-time tracking.
-class BASE_EXPORT VerifierTraits {
+class VerifierTraits {
  public:
   typedef HANDLE Handle;
 
@@ -160,13 +159,13 @@
 // This function may be called by the embedder to disable the use of
 // VerifierTraits at runtime. It has no effect if DummyVerifierTraits is used
 // for ScopedHandle.
-BASE_EXPORT void DisableHandleVerifier();
+void DisableHandleVerifier();
 
 // This should be called whenever the OS is closing a handle, if extended
 // verification of improper handle closing is desired. If |handle| is being
 // tracked by the handle verifier and ScopedHandle is not the one closing it,
 // a CHECK is generated.
-BASE_EXPORT void OnHandleBeingClosed(HANDLE handle);
+void OnHandleBeingClosed(HANDLE handle);
 }  // namespace win
 }  // namespace base
 
diff --git a/base/win/scoped_hstring.h b/base/win/scoped_hstring.h
index 6ba1dab..7c169b9 100644
--- a/base/win/scoped_hstring.h
+++ b/base/win/scoped_hstring.h
@@ -16,7 +16,7 @@
 
 // Scoped HSTRING class to maintain lifetime of HSTRINGs allocated with
 // WindowsCreateString().
-struct BASE_EXPORT ScopedHStringTraits {
+struct ScopedHStringTraits {
   static HSTRING InvalidValue() { return nullptr; }
   static void Free(HSTRING hstr);
 };
@@ -51,7 +51,7 @@
 //   HRESULT hr = WindowsCreateString(..., &win_string);
 //   ScopedHString string(win_string);
 //
-class BASE_EXPORT ScopedHString
+class ScopedHString
     : public ScopedGeneric<HSTRING, base::internal::ScopedHStringTraits> {
  public:
   // Constructs a ScopedHString from an HSTRING, and takes ownership of |hstr|.
diff --git a/base/win/scoped_process_information.h b/base/win/scoped_process_information.h
index 01df861..ca76e21 100644
--- a/base/win/scoped_process_information.h
+++ b/base/win/scoped_process_information.h
@@ -7,7 +7,6 @@
 
 #include <windows.h>
 
-#include "base/base_export.h"
 #include "base/macros.h"
 #include "base/win/scoped_handle.h"
 
@@ -16,7 +15,7 @@
 
 // Manages the closing of process and thread handles from PROCESS_INFORMATION
 // structures. Allows clients to take ownership of either handle independently.
-class BASE_EXPORT ScopedProcessInformation {
+class ScopedProcessInformation {
  public:
   ScopedProcessInformation();
   explicit ScopedProcessInformation(const PROCESS_INFORMATION& process_info);
diff --git a/base/win/scoped_variant.h b/base/win/scoped_variant.h
index 81f4b2b..5390eb9 100644
--- a/base/win/scoped_variant.h
+++ b/base/win/scoped_variant.h
@@ -9,7 +9,6 @@
 #include <oleauto.h>
 #include <stdint.h>
 
-#include "base/base_export.h"
 #include "base/macros.h"
 
 namespace base {
@@ -21,7 +20,7 @@
 // Instead of inheriting from VARIANT, we take the containment approach
 // in order to have more control over the usage of the variant and guard
 // against memory leaks.
-class BASE_EXPORT ScopedVariant {
+class ScopedVariant {
  public:
   // Declaration of a global variant variable that's always VT_EMPTY
   static const VARIANT kEmptyVariant;
diff --git a/base/win/shortcut.h b/base/win/shortcut.h
index 38c12b7..1ab0188 100644
--- a/base/win/shortcut.h
+++ b/base/win/shortcut.h
@@ -8,7 +8,6 @@
 #include <windows.h>
 #include <stdint.h>
 
-#include "base/base_export.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ -31,7 +30,7 @@
 // creation/update, others will be ignored.
 // Callers are encouraged to use the setters provided which take care of
 // setting |options| as desired.
-struct BASE_EXPORT ShortcutProperties {
+struct ShortcutProperties {
   enum IndividualProperties {
     PROPERTIES_TARGET = 1U << 0,
     PROPERTIES_WORKING_DIR = 1U << 1,
@@ -131,7 +130,7 @@
 // |operation|: a choice from the ShortcutOperation enum.
 // If |operation| is SHORTCUT_REPLACE_EXISTING or SHORTCUT_UPDATE_EXISTING and
 // |shortcut_path| does not exist, this method is a no-op and returns false.
-BASE_EXPORT bool CreateOrUpdateShortcutLink(
+bool CreateOrUpdateShortcutLink(
     const FilePath& shortcut_path,
     const ShortcutProperties& properties,
     ShortcutOperation operation);
@@ -146,7 +145,7 @@
 // path so it may not be valid. The function returns true if all requested
 // properties are successfully read. Otherwise some reads have failed and
 // intermediate values written to |properties| should be ignored.
-BASE_EXPORT bool ResolveShortcutProperties(const FilePath& shortcut_path,
+bool ResolveShortcutProperties(const FilePath& shortcut_path,
                                            uint32_t options,
                                            ShortcutProperties* properties);
 
@@ -157,23 +156,23 @@
 // non-NULL). The function returns true if all requested fields are found
 // successfully. Callers can safely use the same variable for both
 // |shortcut_path| and |target_path|.
-BASE_EXPORT bool ResolveShortcut(const FilePath& shortcut_path,
+bool ResolveShortcut(const FilePath& shortcut_path,
                                  FilePath* target_path,
                                  string16* args);
 
 // Pin to taskbar is only supported on Windows 7 and Windows 8. Returns true on
 // those platforms.
-BASE_EXPORT bool CanPinShortcutToTaskbar();
+bool CanPinShortcutToTaskbar();
 
 // Pins a shortcut to the taskbar on Windows 7 and 8. The |shortcut| file must
 // already exist and be a shortcut that points to an executable. The app id of
 // the shortcut is used to group windows and must be set correctly.
-BASE_EXPORT bool PinShortcutToTaskbar(const FilePath& shortcut);
+bool PinShortcutToTaskbar(const FilePath& shortcut);
 
 // Unpins a shortcut from the Windows 7+ taskbar. The |shortcut| must exist and
 // already be pinned to the taskbar. The app id of the shortcut is used as the
 // identifier for the taskbar item to remove and must be set correctly.
-BASE_EXPORT bool UnpinShortcutFromTaskbar(const FilePath& shortcut);
+bool UnpinShortcutFromTaskbar(const FilePath& shortcut);
 
 }  // namespace win
 }  // namespace base
diff --git a/base/win/startup_information.h b/base/win/startup_information.h
index 5b777ba..f82ff75 100644
--- a/base/win/startup_information.h
+++ b/base/win/startup_information.h
@@ -8,14 +8,13 @@
 #include <windows.h>
 #include <stddef.h>
 
-#include "base/base_export.h"
 #include "base/macros.h"
 
 namespace base {
 namespace win {
 
 // Manages the lifetime of additional attributes in STARTUPINFOEX.
-class BASE_EXPORT StartupInformation {
+class StartupInformation {
  public:
   StartupInformation();
 
diff --git a/base/win/wait_chain.h b/base/win/wait_chain.h
index b2e19de..0b5947b 100644
--- a/base/win/wait_chain.h
+++ b/base/win/wait_chain.h
@@ -28,14 +28,14 @@
 // the failure, given that they are not null.
 // TODO(pmonette): Remove |failure_reason| and |last_error| when UMA is
 // supported in the watcher process and pre-rendez-vous.
-BASE_EXPORT bool GetThreadWaitChain(DWORD thread_id,
+bool GetThreadWaitChain(DWORD thread_id,
                                     WaitChainNodeVector* wait_chain,
                                     bool* is_deadlock,
                                     base::string16* failure_reason,
                                     DWORD* last_error);
 
 // Returns a string that represents the node for a wait chain.
-BASE_EXPORT base::string16 WaitChainNodeToString(
+base::string16 WaitChainNodeToString(
     const WAITCHAIN_NODE_INFO& node);
 
 }  // namespace win
diff --git a/base/win/win_client_metrics.h b/base/win/win_client_metrics.h
index 102148f..d63bf20 100644
--- a/base/win/win_client_metrics.h
+++ b/base/win/win_client_metrics.h
@@ -33,7 +33,7 @@
 namespace base {
 namespace win {
 
-BASE_EXPORT void GetNonClientMetrics(NONCLIENTMETRICS_XP* metrics);
+void GetNonClientMetrics(NONCLIENTMETRICS_XP* metrics);
 
 }  // namespace win
 }  // namespace base
diff --git a/base/win/win_util.h b/base/win/win_util.h
index 3d8830b..1acd455 100644
--- a/base/win/win_util.h
+++ b/base/win/win_util.h
@@ -28,7 +28,6 @@
 #include <string>
 #include <vector>
 
-#include "base/base_export.h"
 #include "base/strings/string16.h"
 
 struct IPropertyStore;
@@ -52,7 +51,7 @@
 }
 
 // Returns the string representing the current user sid.
-BASE_EXPORT bool GetUserSidString(std::wstring* user_sid);
+bool GetUserSidString(std::wstring* user_sid);
 
 // Returns false if user account control (UAC) has been disabled with the
 // EnableLUA registry flag. Returns true if user account control is enabled.
@@ -60,42 +59,42 @@
 // machines, might still exist and be set to 0 (UAC disabled), in which case
 // this function will return false. You should therefore check this flag only
 // if the OS is Vista or later.
-BASE_EXPORT bool UserAccountControlIsEnabled();
+bool UserAccountControlIsEnabled();
 
 // Sets the boolean value for a given key in given IPropertyStore.
-BASE_EXPORT bool SetBooleanValueForPropertyStore(
+bool SetBooleanValueForPropertyStore(
     IPropertyStore* property_store,
     const PROPERTYKEY& property_key,
     bool property_bool_value);
 
 // Sets the string value for a given key in given IPropertyStore.
-BASE_EXPORT bool SetStringValueForPropertyStore(
+bool SetStringValueForPropertyStore(
     IPropertyStore* property_store,
     const PROPERTYKEY& property_key,
     const wchar_t* property_string_value);
 
 // Sets the CLSID value for a given key in a given IPropertyStore.
-BASE_EXPORT bool SetClsidForPropertyStore(IPropertyStore* property_store,
+bool SetClsidForPropertyStore(IPropertyStore* property_store,
                                           const PROPERTYKEY& property_key,
                                           const CLSID& property_clsid_value);
 
 // Sets the application id in given IPropertyStore. The function is intended
 // for tagging application/chromium shortcut, browser window and jump list for
 // Win7.
-BASE_EXPORT bool SetAppIdForPropertyStore(IPropertyStore* property_store,
+bool SetAppIdForPropertyStore(IPropertyStore* property_store,
                                           const wchar_t* app_id);
 
 // Adds the specified |command| using the specified |name| to the AutoRun key.
 // |root_key| could be HKCU or HKLM or the root of any user hive.
-BASE_EXPORT bool AddCommandToAutoRun(HKEY root_key, const string16& name,
+bool AddCommandToAutoRun(HKEY root_key, const string16& name,
                                      const string16& command);
 // Removes the command specified by |name| from the AutoRun key. |root_key|
 // could be HKCU or HKLM or the root of any user hive.
-BASE_EXPORT bool RemoveCommandFromAutoRun(HKEY root_key, const string16& name);
+bool RemoveCommandFromAutoRun(HKEY root_key, const string16& name);
 
 // Reads the command specified by |name| from the AutoRun key. |root_key|
 // could be HKCU or HKLM or the root of any user hive. Used for unit-tests.
-BASE_EXPORT bool ReadCommandFromAutoRun(HKEY root_key,
+bool ReadCommandFromAutoRun(HKEY root_key,
                                         const string16& name,
                                         string16* command);
 
@@ -104,12 +103,12 @@
 // exit(), abort(), _exit(), ExitProcess()) and convert them into crashes.
 // Note that not all mechanisms for terminating the process are covered by
 // this. In particular, TerminateProcess() is not caught.
-BASE_EXPORT void SetShouldCrashOnProcessDetach(bool crash);
-BASE_EXPORT bool ShouldCrashOnProcessDetach();
+void SetShouldCrashOnProcessDetach(bool crash);
+bool ShouldCrashOnProcessDetach();
 
 // Adjusts the abort behavior so that crash reports can be generated when the
 // process is aborted.
-BASE_EXPORT void SetAbortBehaviorForCrashReporting();
+void SetAbortBehaviorForCrashReporting();
 
 // Get the size of a struct up to and including the specified member.
 // This is necessary to set compatible struct sizes for different versions
@@ -120,33 +119,33 @@
 
 // Used by tests to mock any wanted state. Call with |state| set to true to
 // simulate being in a domain and false otherwise.
-BASE_EXPORT void SetDomainStateForTesting(bool state);
+void SetDomainStateForTesting(bool state);
 
 // Returns true if the current process can make USER32 or GDI32 calls such as
 // CreateWindow and CreateDC. Windows 8 and above allow the kernel component
 // of these calls to be disabled which can cause undefined behaviour such as
 // crashes. This function can be used to guard areas of code using these calls
 // and provide a fallback path if necessary.
-BASE_EXPORT bool IsUser32AndGdi32Available();
+bool IsUser32AndGdi32Available();
 
 // Takes a snapshot of the modules loaded in the |process|. The returned
 // HMODULEs are not add-ref'd, so they should not be closed and may be
 // invalidated at any time (should a module be unloaded). |process| requires
 // the PROCESS_QUERY_INFORMATION and PROCESS_VM_READ permissions.
-BASE_EXPORT bool GetLoadedModulesSnapshot(HANDLE process,
+bool GetLoadedModulesSnapshot(HANDLE process,
                                           std::vector<HMODULE>* snapshot);
 
 // Adds or removes the MICROSOFT_TABLETPENSERVICE_PROPERTY property with the
 // TABLET_DISABLE_FLICKS & TABLET_DISABLE_FLICKFALLBACKKEYS flags in order to
 // disable pen flick gestures for the given HWND.
-BASE_EXPORT void EnableFlicks(HWND hwnd);
-BASE_EXPORT void DisableFlicks(HWND hwnd);
+void EnableFlicks(HWND hwnd);
+void DisableFlicks(HWND hwnd);
 
 // Returns true if the process is per monitor DPI aware.
-BASE_EXPORT bool IsProcessPerMonitorDpiAware();
+bool IsProcessPerMonitorDpiAware();
 
 // Enable high-DPI support for the current process.
-BASE_EXPORT void EnableHighDPISupport();
+void EnableHighDPISupport();
 
 }  // namespace win
 }  // namespace base
diff --git a/base/win/windows_version.h b/base/win/windows_version.h
index 28c7c89..cd1df78 100644
--- a/base/win/windows_version.h
+++ b/base/win/windows_version.h
@@ -9,7 +9,6 @@
 
 #include <string>
 
-#include "base/base_export.h"
 #include "base/macros.h"
 
 typedef void* HANDLE;
@@ -59,7 +58,7 @@
 // A singleton that can be used to query various pieces of information about the
 // OS and process state. Note that this doesn't use the base Singleton class, so
 // it can be used without an AtExitManager.
-class BASE_EXPORT OSInfo {
+class OSInfo {
  public:
   struct VersionNumber {
     int major;
@@ -139,7 +138,7 @@
 
 // Because this is by far the most commonly-requested value from the above
 // singleton, we add a global-scope accessor here as syntactic sugar.
-BASE_EXPORT Version GetVersion();
+Version GetVersion();
 
 }  // namespace win
 }  // namespace base
diff --git a/base/win/winrt_storage_util.h b/base/win/winrt_storage_util.h
index e24336c..5578415 100644
--- a/base/win/winrt_storage_util.h
+++ b/base/win/winrt_storage_util.h
@@ -9,21 +9,20 @@
 #include <windows.storage.streams.h>
 #include <wrl/client.h>
 
-#include "base/base_export.h"
 
 namespace base {
 namespace win {
 
 // Gets an array of bytes in the |buffer|, |out| represents a array of
 // bytes used by byte stream read and write.
-BASE_EXPORT HRESULT
+HRESULT
 GetPointerToBufferData(ABI::Windows::Storage::Streams::IBuffer* buffer,
                        uint8_t** out,
                        UINT32* length);
 
 // Creates stream |buffer| from |data| that represents a array of bytes
 // and the |length| of bytes.
-BASE_EXPORT HRESULT CreateIBufferFromData(
+HRESULT CreateIBufferFromData(
     const uint8_t* data,
     UINT32 length,
     Microsoft::WRL::ComPtr<ABI::Windows::Storage::Streams::IBuffer>* buffer);