Revert 109622 - Export symbols from content.dll that are depended upon by chrome.dll.

BUG=103896
TBR=dpranke
Review URL: http://codereview.chromium.org/8511058

TBR=tommi@chromium.org
Review URL: http://codereview.chromium.org/8463015

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

1 files changed, 20 insertions, 26 deletions

diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index dc45c92..5c8efba 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -17,7 +17,6 @@
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/string16.h"
-#include "content/common/content_export.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
 #include "ui/base/clipboard/clipboard.h"
@@ -163,61 +162,56 @@ bool IsInspectorProtocolVersionSupported(const std::string& version);
 
 // Gets a localized string given a message id.  Returns an empty string if the
 // message id is not found.
-CONTENT_EXPORT string16 GetLocalizedString(int message_id);
+string16 GetLocalizedString(int message_id);
 
 // Returns the raw data for a resource.  This resource must have been
 // specified as BINDATA in the relevant .rc file.
-CONTENT_EXPORT base::StringPiece GetDataResource(int resource_id);
+base::StringPiece GetDataResource(int resource_id);
 
 // Glue to access the clipboard.
 
 // Get a clipboard that can be used to construct a ScopedClipboardWriterGlue.
-CONTENT_EXPORT ui::Clipboard* ClipboardGetClipboard();
+ui::Clipboard* ClipboardGetClipboard();
 
 // Get a sequence number which uniquely identifies clipboard state.
-CONTENT_EXPORT uint64 ClipboardGetSequenceNumber(ui::Clipboard::Buffer buffer);
+uint64 ClipboardGetSequenceNumber(ui::Clipboard::Buffer buffer);
 
 // Tests whether the clipboard contains a certain format
-CONTENT_EXPORT bool ClipboardIsFormatAvailable(
-    const ui::Clipboard::FormatType& format,
-    ui::Clipboard::Buffer buffer);
+bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
+                                ui::Clipboard::Buffer buffer);
 
 // Reads the available types from the clipboard, if available.
-CONTENT_EXPORT void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
-                                                std::vector<string16>* types,
-                                                bool* contains_filenames);
+void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
+                                 std::vector<string16>* types,
+                                 bool* contains_filenames);
 
 // Reads UNICODE text from the clipboard, if available.
-CONTENT_EXPORT void ClipboardReadText(ui::Clipboard::Buffer buffer,
-                                      string16* result);
+void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result);
 
 // Reads ASCII text from the clipboard, if available.
-CONTENT_EXPORT void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer,
-                                           std::string* result);
+void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result);
 
 // Reads HTML from the clipboard, if available.
-CONTENT_EXPORT void ClipboardReadHTML(ui::Clipboard::Buffer buffer,
-                                      string16* markup,
-                                      GURL* url, uint32* fragment_start,
-                                      uint32* fragment_end);
+void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
+                       GURL* url, uint32* fragment_start,
+                       uint32* fragment_end);
 
-CONTENT_EXPORT void ClipboardReadImage(ui::Clipboard::Buffer buffer,
-                                       std::string* data);
+void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data);
 
 // Embedders implement this function to return the list of plugins to Webkit.
-CONTENT_EXPORT void GetPlugins(bool refresh,
-                               std::vector<webkit::WebPluginInfo>* plugins);
+void GetPlugins(bool refresh,
+                std::vector<webkit::WebPluginInfo>* plugins);
 
 // Returns true if the protocol implemented to serve |url| supports features
 // required by the media engine.
-CONTENT_EXPORT bool IsProtocolSupportedForMedia(const GURL& url);
+bool IsProtocolSupportedForMedia(const GURL& url);
 
 // Returns the locale that this instance of webkit is running as.  This is of
 // the form language-country (e.g., en-US or pt-BR).
-CONTENT_EXPORT std::string GetWebKitLocale();
+std::string GetWebKitLocale();
 
 // Returns true if the embedder is running in single process mode.
-CONTENT_EXPORT bool IsSingleProcess();
+bool IsSingleProcess();
 
 // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER ---------------------------------