4 files changed, 2 insertions, 26 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 7d6b339..a8d5ab2 100755
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -565,9 +565,8 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd,
   Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this));
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
-  // TODO(atwilson): Enable this when setName() becomes available upstream.
-  // if (!frame_name.empty)
-  //   webview()->mainFrame()->setName(frame_name);
+  if (!frame_name.empty())
+    webview()->mainFrame()->setName(frame_name);
   webview()->setDevToolsAgent(
       WebDevToolsAgent::create(webview(), devtools_agent_.get()));
 
@@ -1604,14 +1603,6 @@ void RenderView::OnMissingPluginStatus(
 
 // WebKit::WebViewClient ------------------------------------------------------
 
-// TODO(atwilson): Remove this older API when we've pushed the related changes
-// upstream.
-WebView* RenderView::createView(
-    WebFrame* creator,
-    const WebWindowFeatures& features) {
-  return createView(creator, features, WebString());
-}
-
 WebView* RenderView::createView(
     WebFrame* creator,
     const WebWindowFeatures& features,
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 3d0789e..e98d22c 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -307,10 +307,6 @@ class RenderView : public RenderWidget,
 
   // WebKit::WebViewClient implementation --------------------------------------
 
-  // TODO(atwilson): Remove this API when we push related changes upstream
-  virtual WebKit::WebView* createView(
-      WebKit::WebFrame* creator,
-      const WebKit::WebWindowFeatures& features);
   virtual WebKit::WebView* createView(
       WebKit::WebFrame* creator,
       const WebKit::WebWindowFeatures& features,
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 9aa3c26..cb434f4 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -316,13 +316,6 @@ void TestWebViewDelegate::SetAuthorAndUserStylesEnabled(bool is_enabled) {
 }
 
 // WebViewClient -------------------------------------------------------------
-// TODO(atwilson): Remove this API when we push related changes upstream
-WebView* TestWebViewDelegate::createView(
-    WebFrame* creator,
-    const WebWindowFeatures& window_features) {
-  return shell_->CreateWebView();
-}
-
 WebView* TestWebViewDelegate::createView(
     WebFrame* creator,
     const WebWindowFeatures& window_features,
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index a96049a42..cd03113 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -76,10 +76,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   typedef std::vector<CapturedContextMenuEvent> CapturedContextMenuEvents;
 
   // WebKit::WebViewClient
-  // TODO(atwilson): Remove this API when we push related changes upstream
-  virtual WebKit::WebView* createView(
-      WebKit::WebFrame* creator,
-      const WebKit::WebWindowFeatures& window_features);
   virtual WebKit::WebView* createView(
       WebKit::WebFrame* creator,
       const WebKit::WebWindowFeatures& features,