Modify UpdateLibrary to use async RequestUpdateCheck call

chrome/browser/chromeos/login/update_screen_browsertest.cc

Index: chrome/browser/chromeos/login/update_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/update_screen_browsertest.cc b/chrome/browser/chromeos/login/update_screen_browsertest.cc
index 5fa4eb11256367cea803de6b53e457b8b6bb7403..c6897bd6a789d2b424fc4af29d097b2032fc571c 100644
--- a/chrome/browser/chromeos/login/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/update_screen_browsertest.cc
@@ -16,6 +16,11 @@ using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::ReturnRef;
+using ::testing::Invoke;
+
+static void RequestUpdateCheckSuccess(UpdateCallback callback, void* userdata) {
+  callback(userdata, chromeos::UPDATE_RESULT_SUCCESS, NULL);
+}
 
 class UpdateScreenTest : public WizardInProcessBrowserTest {
  public:
@@ -46,9 +51,9 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
         .Times(1);
     EXPECT_CALL(*mock_update_library_, RemoveObserver(_))
         .Times(AtLeast(1));
-    EXPECT_CALL(*mock_update_library_, CheckForUpdate())
+    EXPECT_CALL(*mock_update_library_, RequestUpdateCheck(_,_))
         .Times(1)
-        .WillOnce(Return(true));
+        .WillOnce(Invoke(RequestUpdateCheckSuccess));
 
     mock_network_library_ = cros_mock_->mock_network_library();
     EXPECT_CALL(*mock_network_library_, Connected())
@@ -165,6 +170,10 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) {
   controller()->set_observer(NULL);
 }
 
+static void RequestUpdateCheckFail(UpdateCallback callback, void* userdata) {
+  callback(userdata, chromeos::UPDATE_RESULT_FAILED, NULL);
+}
+
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorIssuingUpdateCheck) {
   ASSERT_TRUE(controller() != NULL);
   scoped_ptr<MockScreenObserver> mock_screen_observer(new MockScreenObserver());
@@ -185,9 +194,9 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorIssuingUpdateCheck) {
       .Times(1);
   EXPECT_CALL(*mock_update_library_, RemoveObserver(_))
       .Times(AtLeast(1));
-  EXPECT_CALL(*mock_update_library_, CheckForUpdate())
+  EXPECT_CALL(*mock_update_library_, RequestUpdateCheck(_,_))
       .Times(1)
-      .WillOnce(Return(false));
+      .WillOnce(Invoke(RequestUpdateCheckFail));
   EXPECT_CALL(*mock_screen_observer,
               OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
       .Times(1);