Updates to base unittests so they run correctly in libchrome on Android

base/command_line_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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 360 matching lines @@
   // Check the optional quoting of placeholders in programs.
   CommandLine cl_quote_placeholder(FilePath(L"%1"));
   EXPECT_EQ(L"%1", cl_quote_placeholder.GetCommandLineString());
   EXPECT_EQ(L"\"%1\"",
             cl_quote_placeholder.GetCommandLineStringWithPlaceholders());
 }
 #endif
 
 // Calling Init multiple times should not modify the previous CommandLine.
 TEST(CommandLineTest, Init) {
+  // Call Init without checking output once so we know it's been called
+  // whether or not the test runner does so.
+  CommandLine::Init(0, NULL);
   CommandLine* initial = CommandLine::ForCurrentProcess();
   EXPECT_FALSE(CommandLine::Init(0, NULL));
   CommandLine* current = CommandLine::ForCurrentProcess();
   EXPECT_EQ(initial, current);
 }
 
 // Test that copies of CommandLine have a valid StringPiece map.
 TEST(CommandLineTest, Copy) {
   scoped_ptr<CommandLine> initial(new CommandLine(CommandLine::NO_PROGRAM));
   initial->AppendSwitch("a");
   initial->AppendSwitch("bbbbbbbbbbbbbbb");
   initial->AppendSwitch("c");
   CommandLine copy_constructed(*initial);
   CommandLine assigned = *initial;
   CommandLine::SwitchMap switch_map = initial->GetSwitches();
   initial.reset();
   for (const auto& pair : switch_map)
     EXPECT_TRUE(copy_constructed.HasSwitch(pair.first));
   for (const auto& pair : switch_map)
     EXPECT_TRUE(assigned.HasSwitch(pair.first));
 }
 
 } // namespace base