base::Bind: Convert render_view_impl.cc.

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
 
-#include "base/callback_old.h"
+#include "base/bind.h"

[csilv, 2011/11/19 00:52:43]

add bind/bind_helpers.h

[James Hawkins, 2011/11/19 01:13:00]

Done.

 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
@@ skipping 2729 matching lines @@
         GetAlternateErrorPageURL(document_url, HTTP_404);
     if (error_page_url.is_valid()) {
       WebURLError original_error;
       original_error.domain = "http";
       original_error.reason = 404;
       original_error.unreachableURL = document_url;
 
       document_state->set_alt_error_page_fetcher(
           new AltErrorPageResourceFetcher(
               error_page_url, frame, original_error,
-              NewCallback(this, &RenderViewImpl::AltErrorPageFinished)));
+              base::Bind(&RenderViewImpl::AltErrorPageFinished,
+                         base::Unretained(this))));
       return;
     }
   }
 
   std::string error_domain;
   if (content::GetContentClient()->renderer()->HasErrorPage(
           http_status_code, &error_domain)) {
     WebURLError error;
     error.unreachableURL = frame->document().url();
     error.domain = WebString::fromUTF8(error_domain);
@@ skipping 1240 matching lines @@
                         replace);
 
   // Now, create a fetcher for the error page and associate it with the data
   // source we just created via the LoadHTMLString call.  That way if another
   // navigation occurs, the fetcher will get destroyed.
   DocumentState* document_state =
       DocumentState::FromDataSource(frame->provisionalDataSource());
   document_state->set_alt_error_page_fetcher(
       new AltErrorPageResourceFetcher(
           error_page_url, frame, error,
-          NewCallback(this, &RenderViewImpl::AltErrorPageFinished)));
+          base::Bind(&RenderViewImpl::AltErrorPageFinished,
+                     base::Unretained(this))));
   return true;
 }
 
 void RenderViewImpl::AltErrorPageFinished(WebFrame* frame,
                                           const WebURLError& original_error,
                                           const std::string& html) {
   // Here, we replace the blank page we loaded previously.
   // If we failed to download the alternate error page, LoadNavigationErrorPage
   // will simply display a default error page.
   LoadNavigationErrorPage(frame, WebURLRequest(), original_error, html, true);
@@ skipping 691 matching lines @@
   return webview()->settings()->useThreadedCompositor();
 }
 
 void RenderViewImpl::OnJavaBridgeInit(
     const IPC::ChannelHandle& channel_handle) {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
 #endif
 }