Merge 140889 - gdata: Fix a crash at shutdown with pending gdata operations

chrome/browser/chromeos/extensions/external_filesystem_apitest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
@@ skipping 289 matching lines @@
   EXPECT_CALL(*mock_documents_service_,
               DownloadFile(_, _, GURL("https://file_content_url_changed"),
                            _, _))
       .WillOnce(MockDownloadFileCallback(gdata::HTTP_SUCCESS));
 
   // On exit, all operations in progress should be cancelled.
   EXPECT_CALL(*mock_documents_service_, CancelAll());
   // This one is called on exit, but we don't care much about it, as long as it
   // retunrs something valid (i.e. not NULL).
   EXPECT_CALL(*mock_documents_service_, operation_registry()).
-      WillOnce(Return(operation_registry_.get()));
+      WillRepeatedly(Return(operation_registry_.get()));
 
   // All is set... RUN THE TEST.
   EXPECT_TRUE(RunExtensionTest("filesystem_handler")) << message_;
   EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote.html",
       kComponentFlags)) << message_;
 }