Revert 213341 "Clean up TranslateManager's URL fetchers so that ..."

> Clean up TranslateManager's URL fetchers so that they are destroyed in the correct thread.
> 
> BUG=263240
> TEST=browser_tests
> 
> Review URL: https://chromiumcodereview.appspot.com/19555005

TBR=hajimehoshi@chromium.org

Review URL: https://codereview.chromium.org/19804012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213486 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_main.cc

@@ -1690,10 +1690,11 @@ void ChromeBrowserMainParts::PostMainMessageLoopRun() {
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostMainMessageLoopRun();
 
-  // TranslateManager's URL fetchers should be destructed in the main thread
+  // Some tests don't set parameters.ui_task, so they started translate
+  // language fetch that was never completed so we need to cleanup here
   // otherwise it will be done by the destructor in a wrong thread.
-  if (translate_manager_ != NULL)
-    translate_manager_->CleanupPendingUrlFetcher();
+  if (parameters().ui_task == NULL && translate_manager_ != NULL)
+    translate_manager_->CleanupPendingUlrFetcher();
 
   if (notify_result_ == ProcessSingleton::PROCESS_NONE)
     process_singleton_->Cleanup();

chrome/browser/translate/translate_manager.cc

@@ -84,10 +84,6 @@ const int kMaxTranslateLoadCheckAttempts = 20;
 }  // namespace
 
 TranslateManager::~TranslateManager() {
-  // CleanupPendingUrlFetcher should be called ahead of destructing.
-  DCHECK(language_list_.get() == NULL);
-  DCHECK(script_.get() == NULL);
-
   weak_method_factory_.InvalidateWeakPtrs();
 }
 
@@ -638,7 +634,7 @@ void TranslateManager::FetchLanguageListFromTranslateServer(
     NOTREACHED();
 }
 
-void TranslateManager::CleanupPendingUrlFetcher() {
+void TranslateManager::CleanupPendingUlrFetcher() {
   language_list_.reset();
   script_.reset();
 }

chrome/browser/translate/translate_manager.h

@@ -92,7 +92,7 @@ class TranslateManager : public content::NotificationObserver {
 
   // Allows caller to cleanup pending URLFetcher objects to make sure they
   // get released in the appropriate thread... Mainly for tests.
-  void CleanupPendingUrlFetcher();
+  void CleanupPendingUlrFetcher();
 
   // Translates the page contents from |source_lang| to |target_lang|.
   // The actual translation might be performed asynchronously if the translate