OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <list> | 5 #include <list> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 content::ResourceDispatcherHost::Get()->SetDelegate( | 357 content::ResourceDispatcherHost::Get()->SetDelegate( |
358 resource_dispatcher_host_delegate_.get()); | 358 resource_dispatcher_host_delegate_.get()); |
359 } | 359 } |
360 | 360 |
361 TestNavigationListener* test_navigation_listener() { | 361 TestNavigationListener* test_navigation_listener() { |
362 return test_navigation_listener_.get(); | 362 return test_navigation_listener_.get(); |
363 } | 363 } |
364 | 364 |
365 private: | 365 private: |
366 scoped_refptr<TestNavigationListener> test_navigation_listener_; | 366 scoped_refptr<TestNavigationListener> test_navigation_listener_; |
367 scoped_ptr<TestResourceDispatcherHostDelegate> | 367 std::unique_ptr<TestResourceDispatcherHostDelegate> |
368 resource_dispatcher_host_delegate_; | 368 resource_dispatcher_host_delegate_; |
369 | 369 |
370 DISALLOW_COPY_AND_ASSIGN(WebNavigationApiTest); | 370 DISALLOW_COPY_AND_ASSIGN(WebNavigationApiTest); |
371 }; | 371 }; |
372 | 372 |
373 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Api) { | 373 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Api) { |
374 ASSERT_TRUE(StartEmbeddedTestServer()); | 374 ASSERT_TRUE(StartEmbeddedTestServer()); |
375 ASSERT_TRUE(RunExtensionTest("webnavigation/api")) << message_; | 375 ASSERT_TRUE(RunExtensionTest("webnavigation/api")) << message_; |
376 } | 376 } |
377 | 377 |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
772 "extensions/api_test/webnavigation/crash/b.html", | 772 "extensions/api_test/webnavigation/crash/b.html", |
773 embedded_test_server()->port())); | 773 embedded_test_server()->port())); |
774 ui_test_utils::NavigateToURL(browser(), url); | 774 ui_test_utils::NavigateToURL(browser(), url); |
775 | 775 |
776 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 776 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
777 } | 777 } |
778 | 778 |
779 #endif | 779 #endif |
780 | 780 |
781 } // namespace extensions | 781 } // namespace extensions |
OLD | NEW |