roll clang 131935:132017

webkit/glue/resource_fetcher_unittest.cc

 // Copyright (c) 2011 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 "webkit/glue/resource_fetcher.h"
 
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@@ skipping 22 matching lines @@
  public:
   FetcherDelegate()
       : completed_(false),
         timed_out_(false) {
     // Start a repeating timer waiting for the download to complete.  The
     // callback has to be a static function, so we hold on to our instance.
     FetcherDelegate::instance_ = this;
     StartTimer();
   }
 
+  virtual ~FetcherDelegate() {}
+
   ResourceFetcher::Callback* NewCallback() {
     return ::NewCallback(this, &FetcherDelegate::OnURLFetchComplete);
   }
 
   virtual void OnURLFetchComplete(const WebURLResponse& response,
                                   const std::string& data) {
     response_ = response;
     data_ = data;
     completed_ = true;
     timer_.Stop();
@@ skipping 113 matching lines @@
   // When we timeout, we still call the Delegate callback but we pass in empty
   // values.
   EXPECT_TRUE(delegate->completed());
   EXPECT_TRUE(delegate->response().isNull());
   EXPECT_EQ(delegate->data(), std::string());
   EXPECT_FALSE(delegate->timed_out());
 }
 
 class EvilFetcherDelegate : public FetcherDelegate {
  public:
+  virtual ~EvilFetcherDelegate() {}
+
   void SetFetcher(ResourceFetcher* fetcher) {
     fetcher_.reset(fetcher);
   }
 
-  void OnURLFetchComplete(const WebURLResponse& response,
-                          const std::string& data) {
+  virtual void OnURLFetchComplete(const WebURLResponse& response,
+                                  const std::string& data) {
     // Destroy the ResourceFetcher here.  We are testing that upon returning
     // to the ResourceFetcher that it does not crash.
     fetcher_.reset();
     FetcherDelegate::OnURLFetchComplete(response, data);
   }
 
  private:
   scoped_ptr<ResourceFetcher> fetcher_;
 };
 
 TEST_F(ResourceFetcherTests, ResourceFetcherDeletedInCallback) {
   ASSERT_TRUE(test_server_.Start());
 
   WebFrame* frame = test_shell_->webView()->mainFrame();
 
   // Grab a page that takes at least 1 sec to respond, but set the fetcher to
   // timeout in 0 sec.
   GURL url(test_server_.GetURL("slow?1"));
   scoped_ptr<EvilFetcherDelegate> delegate(new EvilFetcherDelegate);
   scoped_ptr<ResourceFetcher> fetcher(new ResourceFetcherWithTimeout(
       url, frame, WebURLRequest::TargetIsMainFrame,
       0, delegate->NewCallback()));
   delegate->SetFetcher(fetcher.release());
 
   delegate->WaitForResponse();
   EXPECT_FALSE(delegate->timed_out());
 }
 
 }  // namespace