STASH: Epic Experimental patch for toolkit-views App List on Mac

chrome/test/base/web_ui_browser_test.cc

 // Copyright 2014 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 "chrome/test/base/web_ui_browser_test.h"
 
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
@@ skipping 225 matching lines @@
         message_loop_runner_(new content::MessageLoopRunner) {}
 
   void Wait() {
     message_loop_runner_->Run();
     content::WaitForLoadStop(preview_dialog_);
   }
 
  private:
   // ChromeContentBrowserClient implementation:
   virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
-      content::WebContents* web_contents) override {
+      content::WebContents* web_contents,
+      gfx::NativeView context) override {
     preview_dialog_ = web_contents;
     observer_.reset(new WebUIJsInjectionReadyObserver(preview_dialog_,
                                                       browser_test_,
                                                       preload_test_fixture_,
                                                       preload_test_name_));
     message_loop_runner_->Quit();
     return NULL;
   }
 
   WebUIBrowserTest* browser_test_;
@@ skipping 219 matching lines @@
 }
 
 GURL WebUIBrowserTest::WebUITestDataPathToURL(
     const base::FilePath::StringType& path) {
   base::FilePath dir_test_data;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data));
   base::FilePath test_path(dir_test_data.Append(kWebUITestFolder).Append(path));
   EXPECT_TRUE(base::PathExists(test_path));
   return net::FilePathToFileURL(test_path);
 }