Enable Activity Logging by default

chrome/browser/extensions/activity_log/activity_log_unittest.cc

 // Copyright (c) 2012 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/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
@@ skipping 58 matching lines @@
   }
 
   void SetPolicy(bool log_arguments) {
     ActivityLog* activity_log = ActivityLog::GetInstance(profile());
     if (log_arguments)
       activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_FULLSTREAM);
     else
       activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_COUNTS);
   }
 
+  bool GetDatabaseEnabled() {
+    ActivityLog* activity_log = ActivityLog::GetInstance(profile());
+    return activity_log->IsDatabaseEnabled();
+  }
+
+  bool GetWatchdogActive() {
+    ActivityLog* activity_log = ActivityLog::GetInstance(profile());
+    return activity_log->IsWatchdogAppActive();
+  }
+
   static void Arguments_Prerender(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     ASSERT_EQ(1U, i->size());
     scoped_refptr<Action> last = i->front();
     std::string args =
         "ID=odlameecjipmbmbejkplpemijjgpljce CATEGORY=content_script API= "
         "ARGS=[\"script\"] PAGE_URL=http://www.google.com/ "
         "OTHER={\"prerender\":true}";
     ASSERT_EQ(args, last->PrintForDebug());
   }
 
   ExtensionService* extension_service_;
 
 #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(ActivityLogTest, Construct) {
-  ActivityLog* activity_log = ActivityLog::GetInstance(profile());
-  ASSERT_TRUE(activity_log->IsLogEnabled());
+  ASSERT_TRUE(GetDatabaseEnabled());
+  ASSERT_FALSE(GetWatchdogActive());
 }
 
 TEST_F(ActivityLogTest, LogAndFetchActions) {
   ActivityLog* activity_log = ActivityLog::GetInstance(profile());
   scoped_ptr<base::ListValue> args(new base::ListValue());
-  ASSERT_TRUE(activity_log->IsLogEnabled());
+  ASSERT_TRUE(GetDatabaseEnabled());
 
   // Write some API calls
   scoped_refptr<Action> action = new Action(kExtensionId,
                                             base::Time::Now(),
                                             Action::ACTION_API_CALL,
                                             "tabs.testMethod");
   activity_log->LogAction(action);
   action = new Action(kExtensionId,
                       base::Time::Now(),
                       Action::ACTION_DOM_ACCESS,
@@ skipping 10 matching lines @@
 TEST_F(ActivityLogTest, LogPrerender) {
   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());
   ActivityLog* activity_log = ActivityLog::GetInstance(profile());
-  ASSERT_TRUE(activity_log->IsLogEnabled());
+  ASSERT_TRUE(GetDatabaseEnabled());
   GURL url("http://www.google.com");
 
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(
           Profile::FromBrowserContext(profile()));
 
   const gfx::Size kSize(640, 480);
   scoped_ptr<prerender::PrerenderHandle> prerender_handle(
       prerender_manager->AddPrerenderFromLocalPredictor(
           url,
@@ skipping 12 matching lines @@
   static_cast<TabHelper::ScriptExecutionObserver*>(activity_log)->
       OnScriptsExecuted(contents, executing_scripts, 0, url);
 
   activity_log->GetActions(
       extension->id(), 0, base::Bind(ActivityLogTest::Arguments_Prerender));
 
   prerender_manager->CancelAllPrerenders();
 }
 
 }  // namespace extensions