Extension activity log database refactoring (step 1)

chrome/browser/extensions/activity_log/stream_noargs_ui_policy_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/activity_log/stream_noargs_ui_policy.h"
@@ skipping 71 matching lines @@
   CommandLine saved_cmdline_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 };
 
 TEST_F(StreamWithoutArgsUIPolicyTest, Construct) {
-  scoped_ptr<ActivityLogPolicy> policy(
-      new StreamWithoutArgsUIPolicy(profile_.get()));
+  ActivityLogPolicy* policy = new StreamWithoutArgsUIPolicy(profile_.get());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                        .Set("name", "Test extension")
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .Build();
   extension_service_->AddExtension(extension.get());
   scoped_ptr<base::ListValue> args(new base::ListValue());
   policy->ProcessAction(ActivityLogPolicy::ACTION_API, extension->id(),
       std::string("tabs.testMethod"), GURL(), args.get(), NULL);
+  policy->Close();
 }
 
 TEST_F(StreamWithoutArgsUIPolicyTest, LogAndFetchActions) {
-  scoped_ptr<ActivityLogPolicy> policy(
-      new StreamWithoutArgsUIPolicy(profile_.get()));
+  ActivityLogPolicy* policy = new StreamWithoutArgsUIPolicy(profile_.get());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                        .Set("name", "Test extension")
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .Build();
   extension_service_->AddExtension(extension.get());
   scoped_ptr<base::ListValue> args(new base::ListValue());
   GURL gurl("http://www.google.com");
 
   // Write some API calls
   policy->ProcessAction(ActivityLogPolicy::ACTION_API, extension->id(),
       std::string("tabs.testMethod"), GURL(), args.get(), NULL);
   policy->ProcessAction(ActivityLogPolicy::ACTION_DOM,
                         extension->id(), std::string("document.write"),
                         gurl, args.get(), NULL);
   policy->ReadData(extension->id(), 0,
       base::Bind(
           StreamWithoutArgsUIPolicyTest::RetrieveActions_LogAndFetchActions));
+
+  policy->Close();
 }
 
 TEST_F(StreamWithoutArgsUIPolicyTest, LogWithoutArguments) {
-  scoped_ptr<ActivityLogPolicy> policy(
-      new StreamWithoutArgsUIPolicy(profile_.get()));
+  ActivityLogPolicy* policy = new StreamWithoutArgsUIPolicy(profile_.get());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                        .Set("name", "Test extension")
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .Build();
   extension_service_->AddExtension(extension.get());
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Set(0, new base::StringValue("hello"));
   args->Set(1, new base::StringValue("world"));
   policy->ProcessAction(ActivityLogPolicy::ACTION_API, extension->id(),
       std::string("tabs.testMethod"), GURL(), args.get(), NULL);
   policy->ReadData(extension->id(), 0,
       base::Bind(StreamWithoutArgsUIPolicyTest::Arguments_Missing));
+  policy->Close();
 }
 
 }  // namespace extensions