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

chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc

 // Copyright 2013 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/ui/views/translate/translate_bubble_view.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/translate/cld_data_harness.h"
+#include "chrome/browser/translate/cld_data_harness_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/translate/core/common/language_detection_details.h"
 #include "content/public/browser/notification_details.h"
 
 class TranslateBubbleViewBrowserTest : public InProcessBrowserTest {
  public:
-  TranslateBubbleViewBrowserTest()
-      : cld_data_harness(test::CreateCldDataHarness()) {}
+  TranslateBubbleViewBrowserTest():
+    cld_data_harness(
+      test::CldDataHarnessFactory::Get()->CreateCldDataHarness()) {}
   ~TranslateBubbleViewBrowserTest() override {}
   void SetUpOnMainThread() override {
     // We can't Init() until PathService has been initialized. This happens
     // very late in the test fixture setup process.
     cld_data_harness->Init();
     InProcessBrowserTest::SetUpOnMainThread();
   }
 
  private:
   scoped_ptr<test::CldDataHarness> cld_data_harness;
@@ skipping 80 matching lines @@
   chrome::CloseWebContents(browser(), web_contents, false);
   EXPECT_EQ(active_index, browser()->tab_strip_model()->active_index());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_FALSE(TranslateBubbleView::IsShowing());
 
   // Close the last tab.
   chrome::CloseWebContents(browser(),
                            browser()->tab_strip_model()->GetActiveWebContents(),
                            false);
 }