more content exports.

R=jam@chromium.org
BUG=90442
TEST=none

Review URL: http://codereview.chromium.org/8381024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107510 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 26 insertions, 18 deletions

diff --git a/content/browser/download/download_buffer.h b/content/browser/download/download_buffer.h
index acbd28a..b6a40af 100644
--- a/content/browser/download/download_buffer.h
+++ b/content/browser/download/download_buffer.h
@@ -28,7 +28,8 @@ typedef std::vector<ContentElement> ContentVector;
 // (if |num_bytes| is not NULL).
 // If |contents| is empty, returns NULL as an |IOBuffer| is not allowed
 // to have 0 bytes.
-net::IOBuffer* AssembleData(const ContentVector& contents, size_t* num_bytes);
+CONTENT_EXPORT net::IOBuffer* AssembleData(const ContentVector& contents,
+                                           size_t* num_bytes);
 
 // |DownloadBuffer| is a thread-safe wrapper around |ContentVector|.
 //
diff --git a/content/browser/download/download_stats.h b/content/browser/download/download_stats.h
index bfb244c..54b7dc4 100644
--- a/content/browser/download/download_stats.h
+++ b/content/browser/download/download_stats.h
@@ -103,7 +103,7 @@ void RecordHistorySize(int size);
 // Record the total number of items and the number of in-progress items showing
 // in the shelf when it closes.  Set |autoclose| to true when the shelf is
 // closing itself, false when the user explicitly closed it.
-void RecordShelfClose(int size, int in_progress, bool autoclose);
+CONTENT_EXPORT void RecordShelfClose(int size, int in_progress, bool autoclose);
 
 // Record the number of downloads removed by ClearAll.
 void RecordClearAllSize(int size);
diff --git a/content/browser/net/url_request_slow_download_job.h b/content/browser/net/url_request_slow_download_job.h
index b5dc8a3..3f0d40f 100644
--- a/content/browser/net/url_request_slow_download_job.h
+++ b/content/browser/net/url_request_slow_download_job.h
@@ -43,7 +43,7 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
 
   // Returns the current number of URLRequestSlowDownloadJobs that have
   // not yet completed.
-  static size_t NumberOutstandingRequests();
+  CONTENT_EXPORT static size_t NumberOutstandingRequests();
 
   // Adds the testing URLs to the net::URLRequestFilter.
   CONTENT_EXPORT static void AddUrlHandler();
diff --git a/content/browser/notification_service_impl.h b/content/browser/notification_service_impl.h
index 0898234..0880974 100644
--- a/content/browser/notification_service_impl.h
+++ b/content/browser/notification_service_impl.h
@@ -17,7 +17,8 @@ class NotificationObserver;
 class NotificationRegistrar;
 }
 
-class NotificationServiceImpl : public content::NotificationService {
+class CONTENT_EXPORT NotificationServiceImpl
+    : public content::NotificationService {
  public:
   static NotificationServiceImpl* current();
 
diff --git a/content/browser/worker_host/worker_service.h b/content/browser/worker_host/worker_service.h
index 69af159..363d553 100644
--- a/content/browser/worker_host/worker_service.h
+++ b/content/browser/worker_host/worker_service.h
@@ -25,7 +25,7 @@ class WorkerServiceObserver;
 struct ViewHostMsg_CreateWorker_Params;
 
 // A singleton for managing HTML5 web workers.
-class WorkerService {
+class CONTENT_EXPORT WorkerService {
  public:
   // Returns the WorkerService singleton.
   static WorkerService* GetInstance();
@@ -76,8 +76,8 @@ class WorkerService {
   static const int kMaxWorkerProcessesWhenSharing;
 
   // Used when we run each worker in a separate process.
-  CONTENT_EXPORT static const int kMaxWorkersWhenSeparate;
-  CONTENT_EXPORT static const int kMaxWorkersPerTabWhenSeparate;
+  static const int kMaxWorkersWhenSeparate;
+  static const int kMaxWorkersPerTabWhenSeparate;
 
  private:
   friend struct DefaultSingletonTraits<WorkerService>;
diff --git a/content/common/worker_messages.h b/content/common/worker_messages.h
index 25fb074..f8fc87d 100644
--- a/content/common/worker_messages.h
+++ b/content/common/worker_messages.h
@@ -13,6 +13,7 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
+#include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
@@ -25,6 +26,8 @@ typedef std::pair<string16, std::vector<int> > QueuedMessage;
 
 #endif  // CONTENT_COMMON_WORKER_MESSAGES_H_
 
+#undef IPC_MESSAGE_EXPORT
+#define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START WorkerMsgStart
 
 // Parameters structure for WorkerHostMsg_PostConsoleMessageToWorkerObject,
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ffbbd3c..46e94de 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -118,6 +118,7 @@
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/gfx/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
+        '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
       ],
diff --git a/content/public/browser/notification_service.h b/content/public/browser/notification_service.h
index 2b19e2fd..8a55b0e 100644
--- a/content/public/browser/notification_service.h
+++ b/content/public/browser/notification_service.h
@@ -16,11 +16,11 @@
 
 namespace content {
 
-class NotificationService {
+class CONTENT_EXPORT NotificationService {
  public:
   // Returns the NotificationService object for the current thread, or NULL if
   // none.
-  static CONTENT_EXPORT NotificationService* current();
+  static NotificationService* current();
 
   virtual ~NotificationService() {}
 
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index a389232..131804b 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -76,7 +76,7 @@ extern const char kEnableMediaStream[];
 extern const char kEnableMonitorProfile[];
 extern const char kEnableOriginBoundCerts[];
 extern const char kEnablePreparsedJsCaching[];
-extern const char kEnablePrivilegedWebGLExtensions[];
+CONTENT_EXPORT extern const char kEnablePrivilegedWebGLExtensions[];
 extern const char kEnableSSLCachedInfo[];
 extern const char kEnableSandboxLogging[];
 extern const char kEnableSeccompSandbox[];
diff --git a/content/public/common/page_transition_types.h b/content/public/common/page_transition_types.h
index 8af1c75..234dfe2 100644
--- a/content/public/common/page_transition_types.h
+++ b/content/public/common/page_transition_types.h
@@ -133,24 +133,26 @@ enum PageTransition {
 };
 
 // Simplifies the provided transition by removing any qualifier
-PageTransition PageTransitionStripQualifier(PageTransition type);
+CONTENT_EXPORT PageTransition PageTransitionStripQualifier(
+    PageTransition type);
 
 bool PageTransitionIsValidType(int32 type);
 
-PageTransition PageTransitionFromInt(int32 type);
+CONTENT_EXPORT PageTransition PageTransitionFromInt(int32 type);
 
 // Returns true if the given transition is a top-level frame transition, or
 // false if the transition was for a subframe.
-bool PageTransitionIsMainFrame(PageTransition type);
+CONTENT_EXPORT bool PageTransitionIsMainFrame(PageTransition type);
 
 // Returns whether a transition involves a redirection
-bool PageTransitionIsRedirect(PageTransition type);
+CONTENT_EXPORT bool PageTransitionIsRedirect(PageTransition type);
 
 // Return the qualifier
-int32 PageTransitionGetQualifier(PageTransition type);
+CONTENT_EXPORT int32 PageTransitionGetQualifier(PageTransition type);
 
 // Return a string version of the core type values.
-const char* PageTransitionGetCoreTransitionString(PageTransition type);
+CONTENT_EXPORT const char* PageTransitionGetCoreTransitionString(
+    PageTransition type);
 
 }  // namespace content
 
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h
index 47d7407..38eedcf 100644
--- a/ipc/ipc_message_macros.h
+++ b/ipc/ipc_message_macros.h
@@ -595,7 +595,7 @@
   IPC_MESSAGE_EXTRA(sync, kind, msg_class, in_cnt, out_cnt, in_list, out_list)
 
 #define IPC_EMPTY_CONTROL_DECL(msg_class, in_cnt, out_cnt, in_list, out_list) \
-  class msg_class : public IPC::Message {                                     \
+  class IPC_MESSAGE_EXPORT msg_class : public IPC::Message {                  \
    public:                                                                    \
     typedef IPC::Message Schema;                                              \
     enum { ID = IPC_MESSAGE_ID() };                                           \
@@ -604,7 +604,7 @@
   };
 
 #define IPC_EMPTY_ROUTED_DECL(msg_class, in_cnt, out_cnt, in_list, out_list)  \
-  class msg_class : public IPC::Message {                                     \
+  class IPC_MESSAGE_EXPORT msg_class : public IPC::Message {                  \
    public:                                                                    \
     typedef IPC::Message Schema;                                              \
     enum { ID = IPC_MESSAGE_ID() };                                           \