Enable Activity Logging by default

chrome/browser/extensions/activity_log/activity_log_enabled_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/run_loop.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
@@ skipping 35 matching lines @@
 };
 
 TEST_F(ActivityLogEnabledTest, NoSwitch) {
   scoped_ptr<TestingProfile> profile(
     static_cast<TestingProfile*>(CreateBrowserContext()));
   EXPECT_FALSE(
       profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
 
   ActivityLog* activity_log = ActivityLog::GetInstance(profile.get());
 
-    EXPECT_FALSE(
-      profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
-  EXPECT_FALSE(activity_log->IsLogEnabled());
-  EXPECT_FALSE(activity_log->IsLogEnabledOnAnyProfile());
+  EXPECT_FALSE(
+    profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
+  EXPECT_FALSE(activity_log->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log->IsWatchdogAppActive());
 }
 
 TEST_F(ActivityLogEnabledTest, CommandLineSwitch) {
   scoped_ptr<TestingProfile> profile1(
     static_cast<TestingProfile*>(CreateBrowserContext()));
   scoped_ptr<TestingProfile> profile2(
     static_cast<TestingProfile*>(CreateBrowserContext()));
 
   CommandLine command_line(CommandLine::NO_PROGRAM);
   CommandLine saved_cmdline_ = *CommandLine::ForCurrentProcess();
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExtensionActivityLogging);
   ActivityLog* activity_log1 = ActivityLog::GetInstance(profile1.get());
   *CommandLine::ForCurrentProcess() = saved_cmdline_;
   ActivityLog* activity_log2 = ActivityLog::GetInstance(profile2.get());
 
   EXPECT_FALSE(
       profile1->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(
       profile2->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
-  EXPECT_TRUE(activity_log1->IsLogEnabled());
-  EXPECT_FALSE(activity_log2->IsLogEnabled());
-  EXPECT_TRUE(activity_log1->IsLogEnabledOnAnyProfile());
-  EXPECT_TRUE(activity_log2->IsLogEnabledOnAnyProfile());
+  EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log1->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
 }
 
 TEST_F(ActivityLogEnabledTest, PrefSwitch) {
   scoped_ptr<TestingProfile> profile1(
     static_cast<TestingProfile*>(CreateBrowserContext()));
   scoped_ptr<TestingProfile> profile2(
     static_cast<TestingProfile*>(CreateBrowserContext()));
 
   EXPECT_FALSE(
       profile1->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(
       profile2->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
 
   profile1->GetPrefs()->SetBoolean(prefs::kWatchdogExtensionActive, true);
   ActivityLog* activity_log1 = ActivityLog::GetInstance(profile1.get());
   ActivityLog* activity_log2 = ActivityLog::GetInstance(profile2.get());
 
   EXPECT_TRUE(
       profile1->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(
       profile2->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
-  EXPECT_TRUE(activity_log1->IsLogEnabled());
-  EXPECT_FALSE(activity_log2->IsLogEnabled());
-  EXPECT_TRUE(activity_log1->IsLogEnabledOnAnyProfile());
-  EXPECT_TRUE(activity_log2->IsLogEnabledOnAnyProfile());
+  EXPECT_TRUE(activity_log1->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
+  EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
 }
 
 TEST_F(ActivityLogEnabledTest, WatchdogSwitch) {
   CommandLine command_line(CommandLine::NO_PROGRAM);
   scoped_ptr<TestingProfile> profile1(
     static_cast<TestingProfile*>(CreateBrowserContext()));
   scoped_ptr<TestingProfile> profile2(
     static_cast<TestingProfile*>(CreateBrowserContext()));
   // Extension service is destroyed by the profile.
   ExtensionService* extension_service1 =
@@ skipping 21 matching lines @@
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .SetID(kActivityLogExtensionId)
           .Build();
   extension_service1->AddExtension(extension.get());
 
   EXPECT_TRUE(
       profile1->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(
       profile2->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
-  EXPECT_TRUE(activity_log1->IsLogEnabled());
-  EXPECT_FALSE(activity_log2->IsLogEnabled());
-  EXPECT_TRUE(activity_log1->IsLogEnabledOnAnyProfile());
-  EXPECT_TRUE(activity_log2->IsLogEnabledOnAnyProfile());
+  EXPECT_TRUE(activity_log1->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
+  EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
 
   extension_service1->DisableExtension(kActivityLogExtensionId,
                                        Extension::DISABLE_USER_ACTION);
 
   EXPECT_FALSE(
       profile1->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(
       profile2->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
-  EXPECT_FALSE(activity_log1->IsLogEnabled());
-  EXPECT_FALSE(activity_log2->IsLogEnabled());
-  EXPECT_TRUE(activity_log1->IsLogEnabledOnAnyProfile());
-  EXPECT_TRUE(activity_log2->IsLogEnabledOnAnyProfile());
+  EXPECT_FALSE(activity_log1->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log1->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
 
   extension_service1->EnableExtension(kActivityLogExtensionId);
 
   EXPECT_TRUE(
       profile1->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(
       profile2->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
-  EXPECT_TRUE(activity_log1->IsLogEnabled());
-  EXPECT_FALSE(activity_log2->IsLogEnabled());
-  EXPECT_TRUE(activity_log1->IsLogEnabledOnAnyProfile());
-  EXPECT_TRUE(activity_log2->IsLogEnabledOnAnyProfile());
+  EXPECT_TRUE(activity_log1->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
+  EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
 
   extension_service1->UninstallExtension(kActivityLogExtensionId, false, NULL);
 
   EXPECT_FALSE(
       profile1->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(
       profile2->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
-  EXPECT_FALSE(activity_log1->IsLogEnabled());
-  EXPECT_FALSE(activity_log2->IsLogEnabled());
-  EXPECT_TRUE(activity_log1->IsLogEnabledOnAnyProfile());
-  EXPECT_TRUE(activity_log2->IsLogEnabledOnAnyProfile());
+  EXPECT_FALSE(activity_log1->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
+  EXPECT_FALSE(activity_log1->IsDatabaseEnabled());
+  EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
+}
+
+TEST_F(ActivityLogEnabledTest, AppAndCommandLine) {
+  // Set the command line switch.
+  CommandLine command_line(CommandLine::NO_PROGRAM);
+  CommandLine saved_cmdline_ = *CommandLine::ForCurrentProcess();
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableExtensionActivityLogging);
+
+  scoped_ptr<TestingProfile> profile(
+    static_cast<TestingProfile*>(CreateBrowserContext()));
+  // Extension service is destroyed by the profile.
+  ExtensionService* extension_service =
+    static_cast<TestExtensionSystem*>(
+        ExtensionSystem::Get(profile.get()))->CreateExtensionService(
+            &command_line, base::FilePath(), false);
+  static_cast<TestExtensionSystem*>(
+      ExtensionSystem::Get(profile.get()))->SetReady();
+
+  ActivityLog* activity_log = ActivityLog::GetInstance(profile.get());
+  // Allow Activity Log to install extension tracker.
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_TRUE(activity_log->IsDatabaseEnabled());
+  EXPECT_FALSE(
+      profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
+  EXPECT_FALSE(activity_log->IsWatchdogAppActive());
+
+  // Enable the extension.
+  scoped_refptr<Extension> extension =
+      ExtensionBuilder()
+          .SetManifest(DictionaryBuilder()
+                       .Set("name", "Watchdog Extension ")
+                       .Set("version", "1.0.0")
+                       .Set("manifest_version", 2))
+          .SetID(kActivityLogExtensionId)
+          .Build();
+  extension_service->AddExtension(extension.get());
+
+  EXPECT_TRUE(activity_log->IsDatabaseEnabled());
+  EXPECT_TRUE(
+      profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
+  EXPECT_TRUE(activity_log->IsWatchdogAppActive());
+
+  extension_service->UninstallExtension(kActivityLogExtensionId, false, NULL);
+
+  EXPECT_TRUE(activity_log->IsDatabaseEnabled());
+  EXPECT_FALSE(
+      profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
+  EXPECT_FALSE(activity_log->IsWatchdogAppActive());
+
+  // Cleanup.
+  *CommandLine::ForCurrentProcess() = saved_cmdline_;
 }
 
 } // namespace extensions