Revert "Move on-demand update checks from the FILE thread to the blocking pool."

chrome/browser/google/google_update_win.h

 // Copyright (c) 2012 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_GOOGLE_GOOGLE_UPDATE_WIN_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_WIN_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/win/scoped_comptr.h"
 #include "google_update/google_update_idl.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
-class SequencedTaskRunner;
+class SingleThreadTaskRunner;
 }  // namespace base
 
 // These values are used for a histogram. Do not reorder.
 enum GoogleUpdateErrorCode {
   // The upgrade completed successfully (or hasn't been started yet).
   GOOGLE_UPDATE_NO_ERROR = 0,
   // Google Update only supports upgrading if Chrome is installed in the default
   // location. This error will appear for developer builds and with
   // installations unzipped to random locations.
   CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY = 1,
@@ skipping 56 matching lines @@
                        const base::string16& new_version) = 0;
 
  protected:
   UpdateCheckDelegate() {}
 };
 
 // Begins an asynchronous update check on |task_runner|. If a new version is
 // available and |install_update_if_possible| is true, the new version will be
 // automatically downloaded and installed. |elevation_window| is the window
 // which should own any necessary elevation UI. Methods on |delegate| will be
-// invoked on the caller's task runner to provide feedback on the operation,
-// with messages localized to |locale| if possible.
-void BeginUpdateCheck(scoped_refptr<base::SequencedTaskRunner> task_runner,
-                      const std::string& locale,
-                      bool install_update_if_possible,
-                      gfx::AcceleratedWidget elevation_window,
-                      const base::WeakPtr<UpdateCheckDelegate>& delegate);
-
-// A type of callback supplied by tests to provide a custom
-// IGlobalInterfaceTable implementation.
-using GlobalInterfaceTableClassFactory =
-    base::Callback<HRESULT(base::win::ScopedComPtr<IGlobalInterfaceTable>*)>;
+// invoked on the caller's thread to provide feedback on the operation, with
+// messages localized to |locale| if possible.
+void BeginUpdateCheck(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    const std::string& locale,
+    bool install_update_if_possible,
+    gfx::AcceleratedWidget elevation_window,
+    const base::WeakPtr<UpdateCheckDelegate>& delegate);
 
 // A type of callback supplied by tests to provide a custom IGoogleUpdate3Web
 // implementation (see src/google_update/google_update_idl.idl).
-using GoogleUpdate3ClassFactory =
-    base::Callback<HRESULT(base::win::ScopedComPtr<IGoogleUpdate3Web>*)>;
+typedef base::Callback<HRESULT(base::win::ScopedComPtr<IGoogleUpdate3Web>*)>
+    GoogleUpdate3ClassFactory;
 
-// For use by tests that wish to provide custom IGlobalInterfaceTable and
-// IGoogleUpdate3Web implementations.
-void SetUpdateCheckFactoriesForTesting(
-    const GlobalInterfaceTableClassFactory& git_factory,
+// For use by tests that wish to provide a custom IGoogleUpdate3Web
+// implementation independent of Google Update's.
+void SetGoogleUpdateFactoryForTesting(
     const GoogleUpdate3ClassFactory& google_update_factory);
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_WIN_H_