Roll webkit DEPS and fix compile errors.

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2006-2008 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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
@@ skipping 776 matching lines @@
 
 void TestWebViewDelegate::UpdateAddressBar(WebView* webView) {
   WebFrame* mainFrame = webView->GetMainFrame();
 
   WebDataSource* dataSource = mainFrame->GetDataSource();
   if (!dataSource)
     dataSource = mainFrame->GetProvisionalDataSource();
   if (!dataSource)
     return;
 
-  SetAddressBarURL(dataSource->GetRequest().GetMainDocumentURL());
+  // TODO(abarth): This is wrong!
+  SetAddressBarURL(dataSource->GetRequest().GetFirstPartyForCookies());
 }
 
 void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) {
   if (frame == top_loading_frame_) {
     top_loading_frame_ = NULL;
 
     if (shell_->layout_test_mode())
       shell_->layout_test_controller()->LocationChangeDone();
   }
 }
@@ skipping 83 matching lines @@
       return L"main frame \"" + name + L"\"";
     else
       return L"main frame";
   } else {
     if (name.length())
       return L"frame \"" + name + L"\"";
     else
       return L"frame (anonymous)";
   }
 }