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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 | 97 |
98 const gfx::Size kSize(640, 480); | 98 const gfx::Size kSize(640, 480); |
99 scoped_ptr<prerender::PrerenderHandle> prerender_handle( | 99 scoped_ptr<prerender::PrerenderHandle> prerender_handle( |
100 prerender_manager->AddPrerenderFromLocalPredictor( | 100 prerender_manager->AddPrerenderFromLocalPredictor( |
101 url, | 101 url, |
102 web_contents->GetController().GetDefaultSessionStorageNamespace(), | 102 web_contents->GetController().GetDefaultSessionStorageNamespace(), |
103 kSize)); | 103 kSize)); |
104 | 104 |
105 page_observer.Wait(); | 105 page_observer.Wait(); |
106 | 106 |
107 activity_log->GetActions( | 107 activity_log->GetFilteredActions( |
108 ext->id(), 0, base::Bind( | 108 ext->id(), |
| 109 Action::ACTION_ANY, |
| 110 "", |
| 111 "", |
| 112 "", |
| 113 0, |
| 114 base::Bind( |
109 ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port)); | 115 ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port)); |
110 | 116 |
111 // Allow invocation of Prerender_Arguments | 117 // Allow invocation of Prerender_Arguments |
112 base::MessageLoop::current()->Run(); | 118 base::MessageLoop::current()->Run(); |
113 } | 119 } |
114 | 120 |
115 } // namespace extensions | 121 } // namespace extensions |
OLD | NEW |