Modularize Compact Language Detector 2 (CLD2) data sources

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

Index: chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
index d4741648aafdd23b4d9e3ef40a7728adea786101..9df8c22c0fbf0fd0621b54ff6e21f22ba4f75ff0 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
@@ -5,8 +5,9 @@
 #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/translate_browser_test_utils.h"
+#include "chrome/browser/translate/scoped_cld_data_harness.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ -19,17 +20,19 @@
 
 class TranslateBubbleViewBrowserTest : public InProcessBrowserTest {
  public:
-  TranslateBubbleViewBrowserTest() {}
+  TranslateBubbleViewBrowserTest()
+     : cld_data_scope(test::CreateScopedCldDataHarness()) {
+  }
   virtual ~TranslateBubbleViewBrowserTest() {}
   virtual void SetUpOnMainThread() OVERRIDE {
     // We can't Init() until PathService has been initialized. This happens
     // very late in the test fixture setup process.
-    dynamic_data_scope.Init();
+    cld_data_scope->Init();
     InProcessBrowserTest::SetUpOnMainThread();
   }
 
  private:
-  test::ScopedCLDDynamicDataHarness dynamic_data_scope;
+  scoped_ptr<test::ScopedCldDataHarness> cld_data_scope;
   DISALLOW_COPY_AND_ASSIGN(TranslateBubbleViewBrowserTest);
 };