Disable Activity Log in non-AL browser tests

chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

Index: chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
index 7e5d77e5809a659f28043ebfc80d1cf6f52e7f5b..893020085424c9b38467ea4a26e251697329953c 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
@@ -13,13 +13,22 @@ namespace extensions {
 
 class ActivityLogApiTest : public ExtensionApiTest {
  public:
-  ActivityLogApiTest() {}
+  ActivityLogApiTest() : saved_cmdline_(CommandLine::NO_PROGRAM) {}
+
+  virtual ~ActivityLogApiTest() {
+    ExtensionApiTest::SetUpCommandLine(&saved_cmdline_);
+    *CommandLine::ForCurrentProcess() = saved_cmdline_;
+  }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
+    saved_cmdline_ = *CommandLine::ForCurrentProcess();
     command_line->AppendSwitch(switches::kEnableExtensionActivityLogging);
     command_line->AppendSwitch(switches::kEnableExtensionActivityLogTesting);
   }
+
+ private:
+  CommandLine saved_cmdline_;
 };
 
 // The test extension sends a message to its 'friend'. The test completes