Fix browser test to work with dynamic CLD

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 "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/translate/translate_browser_test_utils.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() {}
   virtual ~TranslateBubbleViewBrowserTest() {}
+  bool SetUpUserDataDirectory() OVERRIDE {

[msw, 2014/05/21 17:08:32]

nit: virtual

+    if (!InProcessBrowserTest::SetUpUserDataDirectory())
+        return false;
+    dynamic_data_scope.Init();
+    return !(::testing::Test::HasFatalFailure());

[msw, 2014/05/21 17:08:32]

nit: I think you can just return !HasFatalFailure();

+  }
 
  private:
+  test::ScopedCLDDynamicDataHarness dynamic_data_scope;
   DISALLOW_COPY_AND_ASSIGN(TranslateBubbleViewBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TranslateBubbleViewBrowserTest,
                        CloseBrowserWithoutTranslating) {
   EXPECT_FALSE(TranslateBubbleView::IsShowing());
 
   // Show a French page and wait until the bubble is shown.
   content::WebContents* current_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 68 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);
 }