Drive extension functions from ExtensionFunction::Run. The

chrome/browser/extensions/api/identity/identity_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/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/identity/identity_api.h"
@@ skipping 30 matching lines @@
 namespace extensions {
 
 namespace {
 
 namespace errors = identity_constants;
 namespace utils = extension_function_test_utils;
 
 static const char kAccessToken[] = "auth_token";
 static const char kExtensionId[] = "ext_id";
 
-// This helps us be able to wait until an AsyncExtensionFunction calls
+// This helps us be able to wait until an UIThreadExtensionFunction calls
 // SendResponse.
 class SendResponseDelegate
     : public UIThreadExtensionFunction::DelegateForTests {
  public:
   SendResponseDelegate() : should_post_quit_(false) {}
 
   virtual ~SendResponseDelegate() {}
 
   void set_should_post_quit(bool should_quit) {
     should_post_quit_ = should_quit;
@@ skipping 40 matching lines @@
     function->SetArgs(parsed_args.get());
 
     if (!function->GetExtension()) {
       scoped_refptr<Extension> empty_extension(
           utils::CreateEmptyExtension());
       function->set_extension(empty_extension.get());
     }
 
     function->set_browser_context(browser()->profile());
     function->set_has_callback(true);
-    function->Run();
+    function->Run()->Execute();
   }
 
   std::string WaitForError(UIThreadExtensionFunction* function) {
     RunMessageLoopUntilResponse();
     EXPECT_FALSE(function->GetResultList()) << "Did not expect a result";
     return function->GetError();
   }
 
   base::Value* WaitForSingleResult(UIThreadExtensionFunction* function) {
     RunMessageLoopUntilResponse();
     EXPECT_TRUE(function->GetError().empty()) << "Unexpected error: "
                                               << function->GetError();
     const base::Value* single_result = NULL;
     if (function->GetResultList() != NULL &&
         function->GetResultList()->Get(0, &single_result)) {
       return single_result->DeepCopy();
     }
     return NULL;
   }
 
  private:
   void RunMessageLoopUntilResponse() {
-    // If the RunImpl of |function| didn't already call SendResponse, run the
+    // If the RunAsync of |function| didn't already call SendResponse, run the
     // message loop until they do.
     if (!response_delegate_->HasResponse()) {
       response_delegate_->set_should_post_quit(true);
       content::RunMessageLoop();
     }
     EXPECT_TRUE(response_delegate_->HasResponse());
   }
 
   scoped_ptr<SendResponseDelegate> response_delegate_;
 };
@@ skipping 1182 matching lines @@
   EXPECT_EQ(std::string("https://abcdefghij.chromiumapp.org/callback#test"),
             url);
 }
 
 }  // namespace extensions
 
 // Tests the chrome.identity API implemented by custom JS bindings .
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeIdentityJsBindings) {
   ASSERT_TRUE(RunExtensionTest("identity/js_bindings")) << message_;
 }