Fixed a few valgrind tests by not assuming the UrlFetcher arrives with the same URL.

chrome/browser/translate/translate_manager.h

 // Copyright (c) 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_MANAGER_H_
 #define CHROME_BROWSER_TRANSLATE_TRANSLATE_MANAGER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
+#include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/translate_errors.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/url_fetcher.h"
 
 template <typename T> struct DefaultSingletonTraits;
 class GURL;
 struct PageTranslatedDetails;
@@ skipping 13 matching lines @@
   static TranslateManager* GetInstance();
 
   virtual ~TranslateManager();
 
   // Let the caller decide if and when we should fetch the language list from
   // the translate server. This is a NOOP if switches::kDisableTranslate is
   // set or if prefs::kEnableTranslate is set to false.
   // It will not retry more than kMaxRetryLanguageListFetch times.
   void FetchLanguageListFromTranslateServer(PrefService* prefs);
 
+  // Allows caller to cleanup pending URLFetcher objects to make sure they
+  // get released in the appropriate thread... Mainly for tests.
+  void CleanupPendingUlrFetcher();
+
   // Translates the page contents from |source_lang| to |target_lang|.
   // The actual translation might be performed asynchronously if the translate
   // script is not yet available.
   void TranslatePage(TabContents* tab_contents,
                      const std::string& source_lang,
                      const std::string& target_lang);
 
   // Reverts the contents of the page in |tab_contents| to its original
   // language.
   void RevertTranslation(TabContents* tab_contents);
@@ skipping 124 matching lines @@
 
   ScopedRunnableMethodFactory<TranslateManager> method_factory_;
 
   // The JS injected in the page to do the translation.
   std::string translate_script_;
 
   // Delay in milli-seconds after which the translate script is fetched again
   // from the translate server.
   int translate_script_expiration_delay_;
 
-  // Whether the translate JS is currently being retrieved.
-  bool translate_script_request_pending_;
+  // Set when the translate JS is currently being retrieved. NULL otherwise.
+  scoped_ptr<URLFetcher> translate_script_request_pending_;
 
-  // Whether the list of languages is currently being retrieved.
-  bool language_list_request_pending_;
+  // Set when the list of languages is currently being retrieved.
+  // NULL otherwise.
+  scoped_ptr<URLFetcher> language_list_request_pending_;
 
   // The list of pending translate requests.  Translate requests are queued when
   // the translate script is not ready and has to be fetched from the translate
   // server.
   std::vector<PendingRequest> pending_requests_;
 
   // The languages supported by the translation server.
   static base::LazyInstance<std::set<std::string> > supported_languages_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateManager);
 };
 
 #endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_MANAGER_H_