OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/strings/stringprintf.h" | 5 #include "base/strings/stringprintf.h" |
6 #include "chrome/browser/extensions/activity_log/activity_log.h" | 6 #include "chrome/browser/extensions/activity_log/activity_log.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
9 #include "chrome/browser/prerender/prerender_handle.h" | 9 #include "chrome/browser/prerender/prerender_handle.h" |
10 #include "chrome/browser/prerender/prerender_manager.h" | 10 #include "chrome/browser/prerender/prerender_manager.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 | 93 |
94 const gfx::Size kSize(640, 480); | 94 const gfx::Size kSize(640, 480); |
95 scoped_ptr<prerender::PrerenderHandle> prerender_handle( | 95 scoped_ptr<prerender::PrerenderHandle> prerender_handle( |
96 prerender_manager->AddPrerenderFromLocalPredictor( | 96 prerender_manager->AddPrerenderFromLocalPredictor( |
97 url, | 97 url, |
98 web_contents->GetController().GetDefaultSessionStorageNamespace(), | 98 web_contents->GetController().GetDefaultSessionStorageNamespace(), |
99 kSize)); | 99 kSize)); |
100 | 100 |
101 page_observer.Wait(); | 101 page_observer.Wait(); |
102 | 102 |
103 activity_log->GetActions( | 103 activity_log->GetFilteredActions( |
104 ext->id(), 0, base::Bind( | 104 ext->id(), |
| 105 Action::ACTION_ANY, |
| 106 "", |
| 107 "", |
| 108 "", |
| 109 0, |
| 110 base::Bind( |
105 ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port)); | 111 ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port)); |
106 | 112 |
107 // Allow invocation of Prerender_Arguments | 113 // Allow invocation of Prerender_Arguments |
108 base::MessageLoop::current()->Run(); | 114 base::MessageLoop::current()->Run(); |
109 } | 115 } |
110 | 116 |
111 } // namespace extensions | 117 } // namespace extensions |
OLD | NEW |