Removed WebTextCheckingResult legacy API use.

chrome/browser/tab_contents/spelling_menu_observer.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h"
 #include "chrome/browser/spellchecker/spelling_service_client.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/tab_contents/spelling_bubble_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/spellcheck_result.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/public/common/context_menu_params.h"
 #include "grit/generated_resources.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingResult.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 SpellingMenuObserver::SpellingMenuObserver(RenderViewContextMenuProxy* proxy)
     : proxy_(proxy),
       loading_frame_(0),
       succeeded_(false),
       integrate_spelling_service_(false) {
 }
@@ skipping 197 matching lines @@
       Profile* profile = proxy_->GetProfile();
       if (profile)
         profile->GetPrefs()->SetBoolean(prefs::kSpellCheckUseSpellingService,
                                         false);
     }
   }
 }
 
 void SpellingMenuObserver::OnTextCheckComplete(
     int tag,
-    const std::vector<WebKit::WebTextCheckingResult>& results) {
+    const std::vector<SpellCheckResult>& results) {
   animation_timer_.Stop();
 
   // Scan the text-check results and replace the misspelled regions with
   // suggested words. If the replaced text is included in the suggestion list
   // provided by the local spellchecker, we show a "No suggestions from Google"
   // message.
   succeeded_ = true;
   if (results.empty()) {
     succeeded_ = false;
   } else {
-    typedef std::vector<WebKit::WebTextCheckingResult> WebTextCheckingResults;
-    for (WebTextCheckingResults::const_iterator it = results.begin();
+    typedef std::vector<SpellCheckResult> SpellCheckResults;
+    for (SpellCheckResults::const_iterator it = results.begin();
          it != results.end(); ++it) {
-      result_.replace(it->position, it->length, it->replacement);
+      result_.replace(it->location(), it->length(), it->replacement());
     }
     for (std::vector<string16>::const_iterator it = suggestions_.begin();
          it != suggestions_.end(); ++it) {
       if (result_ == *it) {
         succeeded_ = false;
         break;
       }
     }
   }
   if (!succeeded_) {
@@ skipping 12 matching lines @@
   loading_frame_ = (loading_frame_ + 1) & 3;
   string16 loading_message = loading_message_;
   for (int i = 0; i < loading_frame_; ++i)
     loading_message.push_back('.');
 
   // Update the menu item with the text. We disable this item to prevent users
   // from selecting it.
   proxy_->UpdateMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, false, false,
                          loading_message);
 }