Introduce ScopedCommandLine

base/test/command_line_test_util.cc

Index: base/test/command_line_test_util.cc
diff --git a/base/test/command_line_test_util.cc b/base/test/command_line_test_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bc886b1e7761196f76d07a33792bf1a6731506ee
--- /dev/null
+++ b/base/test/command_line_test_util.cc
@@ -0,0 +1,22 @@
+// Copyright 2016 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/test/command_line_test_util.h"
+
+namespace base {
+namespace test {
+
+ScopedCommandLine::ScopedCommandLine()

[Paweł Hajdan Jr., 2016/04/21 11:55:50]

We have a very similar class in base/test/test_suite.cc (TestClientInitializer).

Could you deduplicate that?

Other possible unit test candidates to use this (found using "git grep
'CommandLine::ForCurrentProcess() ='"):
chrome/browser/chromeos/events/event_rewriter_unittest.cc
chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

[robliao, 2016/04/21 18:26:45]

I wanted to hold off on
chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
since it's not a trivial remove + substitute. There's actually mutation and a
strange (possibly erroneous) interaction where the command line gets stored off
via a utility function. I'll need to do a bit of tracing to figure out what's
going on here.


event_rewriter_unittest is more trivial, so I've added that in.

+    : original_command_line_(*base::CommandLine::ForCurrentProcess()) {}
+
+ScopedCommandLine::~ScopedCommandLine() {
+  *base::CommandLine::ForCurrentProcess() = original_command_line_;
+}
+
+CommandLine* ScopedCommandLine::GetProcessCommandLine() {
+  return base::CommandLine::ForCurrentProcess();
+}
+
+}  // namespace test
+}  // namespace base