Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: chrome/browser/extensions/activity_log/activity_log_unittest.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "chrome/browser/extensions/activity_log/activity_log.h" 10 #include "chrome/browser/extensions/activity_log/activity_log.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 230 }
231 231
232 TEST_F(RenderViewActivityLogTest, LogPrerender) { 232 TEST_F(RenderViewActivityLogTest, LogPrerender) {
233 scoped_refptr<const Extension> extension = 233 scoped_refptr<const Extension> extension =
234 ExtensionBuilder() 234 ExtensionBuilder()
235 .SetManifest(DictionaryBuilder() 235 .SetManifest(DictionaryBuilder()
236 .Set("name", "Test extension") 236 .Set("name", "Test extension")
237 .Set("version", "1.0.0") 237 .Set("version", "1.0.0")
238 .Set("manifest_version", 2)) 238 .Set("manifest_version", 2))
239 .Build(); 239 .Build();
240 extension_service_->AddExtension(extension); 240 extension_service_->AddExtension(extension.get());
241 ActivityLog* activity_log = ActivityLog::GetInstance(profile()); 241 ActivityLog* activity_log = ActivityLog::GetInstance(profile());
242 ASSERT_TRUE(activity_log->IsLogEnabled()); 242 ASSERT_TRUE(activity_log->IsLogEnabled());
243 GURL url("http://www.google.com"); 243 GURL url("http://www.google.com");
244 244
245 prerender::PrerenderManager* prerender_manager = 245 prerender::PrerenderManager* prerender_manager =
246 prerender::PrerenderManagerFactory::GetForProfile( 246 prerender::PrerenderManagerFactory::GetForProfile(
247 Profile::FromBrowserContext(profile())); 247 Profile::FromBrowserContext(profile()));
248 248
249 const gfx::Size kSize(640, 480); 249 const gfx::Size kSize(640, 480);
250 scoped_ptr<prerender::PrerenderHandle> prerender_handle( 250 scoped_ptr<prerender::PrerenderHandle> prerender_handle(
(...skipping 16 matching lines...) Expand all
267 267
268 activity_log->GetActions( 268 activity_log->GetActions(
269 extension->id(), 0, base::Bind( 269 extension->id(), 0, base::Bind(
270 RenderViewActivityLogTest::Arguments_Prerender)); 270 RenderViewActivityLogTest::Arguments_Prerender));
271 271
272 prerender_manager->CancelAllPrerenders(); 272 prerender_manager->CancelAllPrerenders();
273 } 273 }
274 274
275 } // namespace extensions 275 } // namespace extensions
276 276
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698