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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 host_resolver()->AddRule("*", "127.0.0.1"); | 130 host_resolver()->AddRule("*", "127.0.0.1"); |
131 StartTestServer(); | 131 StartTestServer(); |
132 int port = test_server()->host_port_pair().port(); | 132 int port = test_server()->host_port_pair().port(); |
133 | 133 |
134 // Get the extension (chrome/test/data/extensions/activity_log) | 134 // Get the extension (chrome/test/data/extensions/activity_log) |
135 const Extension* ext = | 135 const Extension* ext = |
136 LoadExtension(test_data_dir_.AppendASCII("activity_log")); | 136 LoadExtension(test_data_dir_.AppendASCII("activity_log")); |
137 ASSERT_TRUE(ext); | 137 ASSERT_TRUE(ext); |
138 | 138 |
139 ActivityLog* activity_log = ActivityLog::GetInstance(profile()); | 139 ActivityLog* activity_log = ActivityLog::GetInstance(profile()); |
| 140 activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_FULLSTREAM); |
140 ASSERT_TRUE(activity_log); | 141 ASSERT_TRUE(activity_log); |
141 | 142 |
142 //Disable rate limiting in PrerenderManager | 143 //Disable rate limiting in PrerenderManager |
143 prerender::PrerenderManager* prerender_manager = | 144 prerender::PrerenderManager* prerender_manager = |
144 prerender::PrerenderManagerFactory::GetForProfile(profile()); | 145 prerender::PrerenderManagerFactory::GetForProfile(profile()); |
145 ASSERT_TRUE(prerender_manager); | 146 ASSERT_TRUE(prerender_manager); |
146 prerender_manager->mutable_config().rate_limit_enabled = false; | 147 prerender_manager->mutable_config().rate_limit_enabled = false; |
147 // Increase maximum size of prerenderer, otherwise this test fails | 148 // Increase maximum size of prerenderer, otherwise this test fails |
148 // on Windows XP. | 149 // on Windows XP. |
149 prerender_manager->mutable_config().max_bytes = 1000 * 1024 * 1024; | 150 prerender_manager->mutable_config().max_bytes = 1000 * 1024 * 1024; |
(...skipping 21 matching lines...) Expand all Loading... |
171 | 172 |
172 activity_log->GetActions( | 173 activity_log->GetActions( |
173 ext->id(), 0, base::Bind( | 174 ext->id(), 0, base::Bind( |
174 ActivityLogExtensionTest::Prerender_Arguments, port)); | 175 ActivityLogExtensionTest::Prerender_Arguments, port)); |
175 | 176 |
176 // Allow invocation of Prerender_Arguments | 177 // Allow invocation of Prerender_Arguments |
177 base::MessageLoop::current()->Run(); | 178 base::MessageLoop::current()->Run(); |
178 } | 179 } |
179 | 180 |
180 } // namespace extensions | 181 } // namespace extensions |
OLD | NEW |