Sets correct ActivityLog enabled status to the first renderer process

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 22 matching lines @@
 namespace {
 
 const char kExtensionId[] = "abc";
 
 }  // namespace
 
 namespace extensions {
 
 class ActivityLogTest : public ChromeRenderViewHostTestHarness {
  protected:
-  ActivityLogTest() : saved_cmdline_(CommandLine::NO_PROGRAM) {}
-
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined OS_CHROMEOS
     test_user_manager_.reset(new chromeos::ScopedTestUserManager());
 #endif
     CommandLine command_line(CommandLine::NO_PROGRAM);
-    saved_cmdline_ = *CommandLine::ForCurrentProcess();

[felt, 2013/07/23 06:37:34]

why did you remove this? we're still mucking around with the command line and
should be restoring it at the end of the test -- with the switch appended, the
activity log will remain on

[pmarch, 2013/07/29 17:36:47]

Comment below says saved_cmdline_ is used to preserve a copy of the original
command line. The test framework will do this itself as well. However, by
then,	it is too late to call ActivityLog::RecomputeLoggingIsEnabled() in
TearDown().

We do not have RecomputeLoggingIsEnabled() anymore. Moreover, other tests that
muck with the command line do not save it.

[felt, 2013/07/29 19:29:42]

Ahh, I see, the problem was being caused by RecomputeLoggingIsEnabled, not that
the testing framework itself didn't reset the command line? OK, sounds fine
then. (But please double check that you aren't seeing the AL running on the
trybots for other tests.)

     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogging);
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogTesting);
-    ActivityLog::RecomputeLoggingIsEnabled(true);  // Logging now enabled.
     extension_service_ = static_cast<TestExtensionSystem*>(
         ExtensionSystem::Get(profile()))->CreateExtensionService
             (&command_line, base::FilePath(), false);
-    ActivityLog::GetInstance(profile())->Init();
     base::RunLoop().RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
 #if defined OS_CHROMEOS
     test_user_manager_.reset();
 #endif
     base::RunLoop().RunUntilIdle();
     // Restore the original command line and undo the affects of SetUp().

[felt, 2013/07/29 21:05:23]

PS please kill the comment too if removing the code

[pmarch, 2013/08/08 14:42:42]

Done.

-    *CommandLine::ForCurrentProcess() = saved_cmdline_;
-    ActivityLog::RecomputeLoggingIsEnabled(false);  // Logging now disabled.
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   static void RetrieveActions_LogAndFetchActions(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     ASSERT_EQ(2, static_cast<int>(i->size()));
   }
 
   static void RetrieveActions_LogAndFetchPathActions(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
@@ skipping 46 matching lines @@
     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={\"dom_verb\":3,\"extra\":\"(prerender)\",\"page_title\":\"\"}";
     ASSERT_EQ(args, last->PrintForDebug());
   }
 
   ExtensionService* extension_service_;
-  // Used to preserve a copy of the original command line.
-  // The test framework will do this itself as well. However, by then,
-  // it is too late to call ActivityLog::RecomputeLoggingIsEnabled() in
-  // TearDown().
-  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(ActivityLogTest, Enabled) {
-  ASSERT_TRUE(ActivityLog::IsLogEnabledOnAnyProfile());
-}
-
 TEST_F(ActivityLogTest, Construct) {
   ActivityLog* activity_log = ActivityLog::GetInstance(profile());
   scoped_ptr<base::ListValue> args(new base::ListValue());
   ASSERT_TRUE(activity_log->IsLogEnabled());
   activity_log->LogAPIAction(
       kExtensionId, std::string("tabs.testMethod"), args.get(), std::string());
 }
 
 TEST_F(ActivityLogTest, LogAndFetchActions) {
   ActivityLog* activity_log = ActivityLog::GetInstance(profile());
@@ skipping 100 matching lines @@
       OnScriptsExecuted(contents, executing_scripts, 0, url);
 
   activity_log->GetActions(
       extension->id(), 0, base::Bind(ActivityLogTest::Arguments_Prerender));
 
   prerender_manager->CancelAllPrerenders();
 }
 
 }  // namespace extensions