Roll forward 8722,8721

chrome/browser/spellchecker.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_SPELLCHECKER_H__
 #define CHROME_BROWSER_SPELLCHECKER_H__
 
 #include <vector>
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
+#if defined(OS_WIN)
 #include "chrome/browser/profile.h"
+#else
+// TODO(port): remove scaffolding, use profile.h for both POSIX and WIN.
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
 #include "chrome/browser/spellcheck_worditerator.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_member.h"
 
 #include "base/task.h"
 #include "unicode/uscript.h"
 
 class Hunspell;
 class PrefService;
@@ skipping 145 matching lines @@
   // Used for generating callbacks to spellchecker, since spellchecker is a
   // non-reference counted object. The callback is generated by generating tasks
   // using NewRunableMethod on these objects.
   ScopedRunnableMethodFactory<SpellChecker> dic_download_state_changer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellChecker);
 };
 
 #endif  // #ifndef CHROME_BROWSER_SPELLCHECKER_H__