Refactor language detection logic to allow non-static CLD data sources.

components/translate/content/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 "components/translate/content/renderer/translate_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/translate/content/common/translate_messages.h"
+#include "components/translate/content/renderer/renderer_cld_data_provider.h"
+#include "components/translate/content/renderer/static_renderer_cld_data_provider.h"
 #include "components/translate/core/common/translate_constants.h"
 #include "components/translate/core/common/translate_metrics.h"
 #include "components/translate/core/common/translate_util.h"
 #include "components/translate/core/language_detection/language_detection_util.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_platform_file.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ skipping 49 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // TranslateHelper, public:
 //
 TranslateHelper::TranslateHelper(content::RenderView* render_view,
                                  int world_id,
                                  int extension_group,
                                  const std::string& extension_scheme)
     : content::RenderViewObserver(render_view),
       page_seq_no_(0),
       translation_pending_(false),
-      cld_data_provider_(translate::CreateRendererCldDataProviderFor(this)),
+      cld_data_provider_(
+          static_cast<translate::RendererCldDataProvider*>(NULL)),
       cld_data_polling_started_(false),
       cld_data_polling_canceled_(false),
       deferred_page_capture_(false),
       deferred_page_seq_no_(-1),
       world_id_(world_id),
       extension_group_(extension_group),
       extension_scheme_(extension_scheme),
       weak_method_factory_(this) {
+  if (!translate::RendererCldDataProvider::IsInitialized()) {
+    // No provider is yet set for this renderer process. Initialize one now.
+    translate::RendererCldDataProvider* provider;
+
+    // Note: Customize the data source and provider here, as desired.

[Andrew Hayden (chromium.org), 2014/09/26 10:22:49]

This comment should look like the other one for maintainers. Call out
maintainers specifically and remind them that this is the DEFAULT, which
embedders can override.

[Andrew Hayden (chromium.org), 2014/10/28 15:18:39]

Done.

+    provider = new translate::StaticRendererCldDataProvider();
+
+    translate::RendererCldDataProvider::Set(provider, false);
+  }
+  cld_data_provider_.reset(translate::RendererCldDataProvider::Get());
 }
 
 TranslateHelper::~TranslateHelper() {
   CancelPendingTranslation();
   CancelCldDataPolling();
 }
 
 void TranslateHelper::PrepareForUrl(const GURL& url) {
   ++page_seq_no_;
   Send(new ChromeViewHostMsg_TranslateAssignedSequenceNumber(
@@ skipping 525 matching lines @@
   // this, everything should start being ON_TIME. This should never run more
   // than twice in a page load, under any conditions.
   // Also note that language detection is triggered off of a delay AFTER the
   // page load completed event has fired, making this very much off the critical
   // path.
   content::RenderThread::Get()->UpdateHistograms(
       content::kHistogramSynchronizerReservedSequenceNumber);
 }
 
 }  // namespace translate