This CL makes the TranslationService class send the text to be translated to ...

chrome/renderer/translate/page_translator.cc

 // 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.
 
 #include "chrome/renderer/translate/page_translator.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
+namespace {
+
 // The following elements are not supposed to be translated.
 const char* const kSkippedTags[] = { "APPLET", "AREA", "BASE", "FRAME",
     "FRAMESET", "HR", "IFRAME", "IMG", "INPUT", "LINK", "META", "MAP",
     "OBJECT", "PARAM", "SCRIPT", "STYLE", "TEXTAREA" };
 
 // The following tags are not considered as breaking a block of text.
 // Notes: does SPAN belong to this list?
 const char* const kInlineTags[] = { "A", "ABBR", "ACRONYM", "B", "BIG", "DEL",
     "EM", "I", "INS", "S", "SPAN", "STRIKE", "STRONG", "SUB", "SUP", "U" };
+}
 
 // Returns true when s1 < s2.
 bool PageTranslator::WebStringCompare::operator()(
     const WebKit::WebString& s1, const WebKit::WebString& s2) const {
   int len1 = s1.length();
   int len2 = s2.length();
   int r = base::strncmp16(s1.data(), s2.data(), std::min(len1, len2));
 
   if (r < 0)
     return true;
@@ skipping 70 matching lines @@
 void PageTranslator::TranslationError(int work_id, int error_id) {
   // TODO(jcampan): may be we should show somehow that something went wrong to
   //                the user?
   ClearNodeZone(work_id);
 }
 
 void PageTranslator::TextTranslated(
     int work_id, const std::vector<string16>& translated_text_chunks) {
   std::map<int, NodeList*>::iterator iter = pending_translations_.find(work_id);
   if (iter == pending_translations_.end()) {
-    NOTREACHED() << "Translation results received for unknown node zone";
+    // We received some translated text we were not expecting.  It could be we
+    // navigated away from the page or that the translation was undone.
     return;
   }
 
   NodeList* nodes = iter->second;
   // Check the integrity of the response.
   if (translated_text_chunks.size() != nodes->size()) {
     // TODO(jcampan) reenable when we figured out why the server messed up the
     // anchor tags.
     // NOTREACHED() << "Translation results received are inconsistent with the "
     //    "request";
@@ skipping 46 matching lines @@
 
   if (new_text_block) {
     NodeList* text_nodes = element_stack->top();
     element_stack->pop();
     // If no nodes were added to text_nodes, then it has not been added to
     // text_nodes_list and must be deleted.
     if (text_nodes->empty())
       delete text_nodes;
   }
 }