Translate: split language code typo correction to apply unit tests.

chrome/renderer/translate_helper.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/renderer/translate_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 75 matching lines @@
   // Get the document language as set by WebKit from the http-equiv
   // meta tag for "content-language".  This may or may not also
   // have a value derived from the actual Content-Language HTTP
   // header.  The two actually have different meanings (despite the
   // original intent of http-equiv to be an equivalent) with the former
   // being the language of the document and the latter being the
   // language of the intended audience (a distinction really only
   // relevant for things like langauge textbooks).  This distinction
   // shouldn't affect translation.
   std::string language = document.contentLanguage().utf8();
-  size_t coma_index = language.find(',');
-  if (coma_index != std::string::npos) {
-    // There are more than 1 language specified, just keep the first one.
-    language = language.substr(0, coma_index);
-  }
-  TrimWhitespaceASCII(language, TRIM_ALL, &language);
-
-  // An underscore instead of a dash is a frequent mistake.
-  size_t underscore_index = language.find('_');
-  if (underscore_index != std::string::npos)
-    language[underscore_index] = '-';
-
-  // Change everything up to a dash to lower-case and everything after to upper.
-  size_t dash_index = language.find('-');
-  if (dash_index != std::string::npos) {
-    language = StringToLowerASCII(language.substr(0, dash_index)) +
-        StringToUpperASCII(language.substr(dash_index));
-  } else {
-    language = StringToLowerASCII(language);
-  }
+  CorrectLanguageCodeTypo(&language);
 
 #if defined(ENABLE_LANGUAGE_DETECTION)
   if (language.empty()) {
     base::TimeTicks begin_time = base::TimeTicks::Now();
     language = DetermineTextLanguage(contents);
     UMA_HISTOGRAM_MEDIUM_TIMES("Renderer4.LanguageDetection",
                                base::TimeTicks::Now() - begin_time);
   } else {
     VLOG(9) << "PageLanguageFromMetaTag: " << language;
   }
@@ skipping 62 matching lines @@
   VLOG(9) << "Detected lang_id: " << language << ", from Text:\n" << text
           << "\n*************************************\n";
   return language;
 }
 #endif  // defined(ENABLE_LANGUAGE_DETECTION)
 
 ////////////////////////////////////////////////////////////////////////////////
 // TranslateHelper, protected:
 //
 // static
+void TranslateHelper::CorrectLanguageCodeTypo(std::string* code) {
+  DCHECK(code);
+
+  size_t coma_index = code->find(',');
+  if (coma_index != std::string::npos) {
+    // There are more than 1 language specified, just keep the first one.
+    *code = code->substr(0, coma_index);
+  }
+  TrimWhitespaceASCII(*code, TRIM_ALL, code);
+
+  // An underscore instead of a dash is a frequent mistake.
+  size_t underscore_index = code->find('_');
+  if (underscore_index != std::string::npos)
+    (*code)[underscore_index] = '-';
+
+  // Change everything up to a dash to lower-case and everything after to upper.
+  size_t dash_index = code->find('-');
+  if (dash_index != std::string::npos) {
+    *code = StringToLowerASCII(code->substr(0, dash_index)) +
+        StringToUpperASCII(code->substr(dash_index));
+  } else {
+    *code = StringToLowerASCII(*code);
+  }
+}
+
+// static
 void TranslateHelper::ConvertLanguageCodeSynonym(std::string* code) {
+  DCHECK(code);
+
   // Apply liner search here because number of items in the list is just four.
   for (size_t i = 0; i < arraysize(kLanguageCodeSynonyms); ++i) {
     if (code->compare(kLanguageCodeSynonyms[i].from) == 0) {
       *code = std::string(kLanguageCodeSynonyms[i].to);
       break;
     }
   }
 }
 
 bool TranslateHelper::IsTranslateLibAvailable() {
@@ skipping 270 matching lines @@
   WebView* web_view = render_view()->GetWebView();
   if (!web_view) {
     // When the WebView is going away, the render view should have called
     // CancelPendingTranslation() which should have stopped any pending work, so
     // that case should not happen.
     NOTREACHED();
     return NULL;
   }
   return web_view->mainFrame();
 }