Allow browser tests to run with dynamic CLD data.

chrome/browser/translate/translate_tab_helper.h

 // Copyright 2011 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.
 
 #ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_
 #define CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/translate/translate_bubble_model.h"
 #include "components/translate/content/browser/content_translate_driver.h"
 #include "components/translate/core/browser/translate_client.h"
 #include "components/translate/core/browser/translate_step.h"
 #include "components/translate/core/common/translate_errors.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 #if defined(CLD2_DYNAMIC_MODE)
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
 #include "base/task_runner.h"
 #endif
 
 namespace base {
 class File;
-}
+}  // namespace base
 
 namespace content {
 class BrowserContext;
 class WebContents;
-}
+}  // namespace content
+
+namespace test {
+class TranslateBrowserUtilsTest;
+}  // namespace test
 
 struct LanguageDetectionDetails;
 class PrefService;
 class TranslateAcceptLanguages;
 class TranslatePrefs;
 class TranslateManager;
 
 class TranslateTabHelper
     : public TranslateClient,
       public content::WebContentsObserver,
@@ skipping 48 matching lines @@
                                const std::string target_language,
                                TranslateErrors::Type error_type,
                                bool triggered_from_menu) OVERRIDE;
   virtual bool IsTranslatableURL(const GURL& url) OVERRIDE;
   virtual void ShowReportLanguageDetectionErrorUI(
       const GURL& report_url) OVERRIDE;
 
  private:
   explicit TranslateTabHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<TranslateTabHelper>;
+  friend class test::TranslateBrowserUtilsTest; // For cleaning up static state

[Sorin Jianu, 2014/05/15 17:16:13]

Ends with .

[Andrew Hayden (chromium.org), 2014/05/16 17:53:20]

Done.

 
   // content::WebContentsObserver implementation.
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual void WebContentsDestroyed() OVERRIDE;
 
@@ skipping 23 matching lines @@
   static void HandleCLDDataRequest();
 
   // If the CLD data is ready, send it to the renderer. Briefly checks the lock.
   void MaybeSendCLDDataAvailable();
 
   // Sends the renderer a response containing the data file handle. No locking.
   void SendCLDDataAvailable(const base::File* handle,
                             const uint64 data_offset,
                             const uint64 data_length);
 
+  // For testing purposes only, clear the s_cached_* state. Leaks the open

[Sorin Jianu, 2014/05/15 17:16:13]

clears

[Sorin Jianu, 2014/05/15 17:16:13]

Since we already have test friendship, would it be an option to move this
function in a module that is only used for tests? In other words, if this is not
production code, it should live in a test module.

[Andrew Hayden (chromium.org), 2014/05/16 17:53:20]

Done.

+  // file handle, because renderer processes could be using it and there's no
+  // way to be sure that they aren't. This effectively allows a test harness
+  // to wipe any cached state.
+  static void ClearCLDDataForTest();
+
   // The data file,  cached as long as the process stays alive.
   // We also track the offset at which the data starts, and its length.
   static base::File* s_cached_file_; // guarded by file_lock_
   static uint64 s_cached_data_offset_; // guarded by file_lock_
   static uint64 s_cached_data_length_; // guarded by file_lock_
 
   // Guards s_cached_file_
   static base::LazyInstance<base::Lock> s_file_lock_;
 
 #endif
@@ skipping 10 matching lines @@
 
   // Necessary for binding the callback to HandleCLDDataRequest on the blocking
   // pool and for delaying translation initialization until the page has
   // finished loading on a reload.
   base::WeakPtrFactory<TranslateTabHelper> weak_pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateTabHelper);
 };
 
 #endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_