Porting profiles to the Mac.

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

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

1 files changed, 7 insertions, 15 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 1e1db05..b208e89 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -27,22 +27,11 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cache_manager_host.h"
 #include "chrome/browser/extensions/user_script_master.h"
-#if defined(OS_WIN)
-#include "chrome/browser/history/history.h"
-#else
-// TODO(port): remove scaffolding, use history.h for both POSIX and WIN.
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif  // !defined(OS_WIN)
-
 #include "chrome/browser/plugin_service.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_helper.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/resource_message_filter.h"
-#if defined(OS_MACOSX)
-// TODO(port): Enable when we finish porting spellchecker to os x.
-#else
-#include "chrome/browser/spellchecker.h"
-#endif  // !defined(OS_WIN)
 #include "chrome/browser/visitedlink_master.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -60,6 +49,9 @@
 // TODO(port): see comment by the only usage of RenderViewHost in this file.
 #include "chrome/browser/renderer_host/render_view_host.h"
 
+#include "chrome/browser/history/history.h"
+#include "chrome/browser/spellchecker.h"
+
 // Once the above TODO is finished, then this block is all Windows-specific
 // files.
 #include "base/win_util.h"
@@ -479,9 +471,9 @@ void BrowserRenderProcessHost::WidgetHidden() {
 }
 
 void BrowserRenderProcessHost::AddWord(const std::wstring& word) {
-#if defined(OS_MACOSX)
+#if !defined(OS_WIN)
   // TODO(port): reimplement when we get the spell checker up and running on
-  // OS X.
+  // other platforms.
   NOTIMPLEMENTED();
 #else
   base::Thread* io_thread = g_browser_process->io_thread();
@@ -489,7 +481,7 @@ void BrowserRenderProcessHost::AddWord(const std::wstring& word) {
     io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
         profile()->GetSpellChecker(), &SpellChecker::AddWord, word));
   }
-#endif // !defined(OS_MACOSX)
+#endif // !defined(OS_WIN)
 }
 
 base::ProcessHandle BrowserRenderProcessHost::GetRendererProcessHandle() {