Revert "Fix more symbol exports and a compile failure for the component build of"

TBR=jam@chromium.org
BUG=90442

TEST=

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

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

6 files changed, 19 insertions, 30 deletions

diff --git a/content/browser/browser_process_sub_thread.h b/content/browser/browser_process_sub_thread.h
index bfaab3f..55978e6 100644
--- a/content/browser/browser_process_sub_thread.h
+++ b/content/browser/browser_process_sub_thread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -8,7 +8,6 @@
 
 #include "base/basictypes.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/content_export.h"
 
 class NotificationService;
 
@@ -21,7 +20,7 @@ class NotificationService;
 // Applications must initialize the COM library before they can call
 // COM library functions other than CoGetMalloc and memory allocation
 // functions, so this class initializes COM for those users.
-class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThread {
+class BrowserProcessSubThread : public BrowserThread {
  public:
   explicit BrowserProcessSubThread(BrowserThread::ID identifier);
   virtual ~BrowserProcessSubThread();
diff --git a/content/browser/download/download_types.h b/content/browser/download/download_types.h
index 952b195..b4f4a36 100644
--- a/content/browser/download/download_types.h
+++ b/content/browser/download/download_types.h
@@ -11,7 +11,6 @@
 #include "base/file_path.h"
 #include "base/memory/linked_ptr.h"
 #include "base/synchronization/lock.h"
-#include "content/common/content_export.h"
 #include "net/base/file_stream.h"
 
 namespace net {
@@ -34,7 +33,7 @@ struct DownloadBuffer {
 };
 
 // Holds the information about how to save a download file.
-struct CONTENT_EXPORT DownloadSaveInfo {
+struct DownloadSaveInfo {
   DownloadSaveInfo();
   DownloadSaveInfo(const DownloadSaveInfo& info);
   ~DownloadSaveInfo();
diff --git a/content/browser/speech/speech_input_manager.cc b/content/browser/speech/speech_input_manager.cc
index c247bb6..d115c89 100644
--- a/content/browser/speech/speech_input_manager.cc
+++ b/content/browser/speech/speech_input_manager.cc
@@ -184,12 +184,4 @@ void SpeechInputManager::OnFocusChanged(int caller_id) {
   }
 }
 
-SpeechInputManager::SpeechInputRequest::SpeechInputRequest()
-    : delegate(NULL),
-      is_active(false) {
-}
-
-SpeechInputManager::SpeechInputRequest::~SpeechInputRequest() {
-}
-
 }  // namespace speech_input
diff --git a/content/browser/speech/speech_input_manager.h b/content/browser/speech/speech_input_manager.h
index af14b0d..afac442 100644
--- a/content/browser/speech/speech_input_manager.h
+++ b/content/browser/speech/speech_input_manager.h
@@ -20,7 +20,7 @@ namespace speech_input {
 // handles requests received from various render views and makes sure only one
 // of them can use speech recognition at a time. It also sends recognition
 // results and status events to the render views when required.
-class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
+class SpeechInputManager : public SpeechRecognizerDelegate {
  public:
   // Implemented by the dispatcher host to relay events to the render views.
   class Delegate {
@@ -35,13 +35,13 @@ class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
     virtual ~Delegate() {}
   };
 
-  SpeechInputManager();
+  CONTENT_EXPORT SpeechInputManager();
 
   // Invokes the platform provided microphone settings UI in a non-blocking way,
   // via the BrowserThread::FILE thread.
   static void ShowAudioInputSettings();
 
-  virtual ~SpeechInputManager();
+  CONTENT_EXPORT virtual ~SpeechInputManager();
 
   // Handlers for requests from render views.
 
diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index 6a66641..0c79ed6 100644
--- a/content/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -11,7 +11,6 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/common/content_export.h"
 #include "content/common/net/url_fetcher.h"
 #include "content/common/speech_input_result.h"
 #include "googleurl/src/gurl.h"
@@ -32,7 +31,7 @@ class SpeechRecognitionRequest : public URLFetcher::Delegate {
   static int url_fetcher_id_for_tests;
 
   // Interface for receiving callbacks from this object.
-  class CONTENT_EXPORT Delegate {
+  class Delegate {
    public:
     virtual void SetRecognitionResult(
         bool error, const SpeechInputResultArray& result) = 0;
diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h
index e350e65..f109e92 100644
--- a/content/browser/speech/speech_recognizer.h
+++ b/content/browser/speech/speech_recognizer.h
@@ -21,7 +21,7 @@ namespace speech_input {
 
 // Records audio, sends recorded audio to server and translates server response
 // to recognition result.
-class CONTENT_EXPORT SpeechRecognizer
+class SpeechRecognizer
     : public base::RefCountedThreadSafe<SpeechRecognizer>,
       public media::AudioInputController::EventHandler,
       public SpeechRecognitionRequestDelegate {
@@ -35,7 +35,7 @@ class CONTENT_EXPORT SpeechRecognizer
   };
 
   // Implemented by the caller to receive recognition events.
-  class CONTENT_EXPORT Delegate {
+  class Delegate {
    public:
     virtual void SetRecognitionResult(
         int caller_id,
@@ -79,27 +79,27 @@ class CONTENT_EXPORT SpeechRecognizer
     virtual ~Delegate() {}
   };
 
-  SpeechRecognizer(Delegate* delegate,
-                   int caller_id,
-                   const std::string& language,
-                   const std::string& grammar,
-                   bool censor_results,
-                   const std::string& hardware_info,
-                   const std::string& origin_url);
+  CONTENT_EXPORT SpeechRecognizer(Delegate* delegate,
+                                  int caller_id,
+                                  const std::string& language,
+                                  const std::string& grammar,
+                                  bool censor_results,
+                                  const std::string& hardware_info,
+                                  const std::string& origin_url);
   virtual ~SpeechRecognizer();
 
   // Starts audio recording and does recognition after recording ends. The same
   // SpeechRecognizer instance can be used multiple times for speech recognition
   // though each recognition request can be made only after the previous one
   // completes (i.e. after receiving Delegate::DidCompleteRecognition).
-  bool StartRecording();
+  CONTENT_EXPORT bool StartRecording();
 
   // Stops recording audio and starts recognition.
-  void StopRecording();
+  CONTENT_EXPORT void StopRecording();
 
   // Stops recording audio and cancels recognition. Any audio recorded so far
   // gets discarded.
-  void CancelRecognition();
+  CONTENT_EXPORT void CancelRecognition();
 
   // AudioInputController::EventHandler methods.
   virtual void OnCreated(media::AudioInputController* controller) { }