Header cleanup in base....

base/field_trial_unittest.cc

 // Copyright (c) 2006-2009 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.
 
 // Test of FieldTrial class
 
 #include "base/field_trial.h"
 
-#include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FieldTrialTest : public testing::Test {
  public:
   FieldTrialTest() : trial_list_() { }
 
  private:
   FieldTrialList trial_list_;
 };
 
@@ skipping 49 matching lines @@
   }
 }
 
 TEST_F(FieldTrialTest, RemainingProbability) {
   // First create a test that hasn't had a winner yet.
   const std::string winner = "Winner";
   const std::string loser = "Loser";
   scoped_refptr<FieldTrial> trial;
   int counter = 0;
   do {
-    std::string name = StringPrintf("trial%d", ++counter);
+    std::string name = base::StringPrintf("trial%d", ++counter);
     trial = new FieldTrial(name, 10);
     trial->AppendGroup(loser, 5);  // 50% chance of not being chosen.
   } while (trial->group() != FieldTrial::kNotParticipating);
 
   // Now add a winner with all remaining probability.
   trial->AppendGroup(winner, FieldTrial::kAllRemainingProbability);
 
   // And that winner should ALWAYS win.
   EXPECT_EQ(winner, trial->group_name());
 }
@@ skipping 106 matching lines @@
   // But it is an error to try to change to a different winner.
   EXPECT_FALSE(FieldTrialList::StringAugmentsState("Some name/Loser/"));
 }
 
 TEST_F(FieldTrialTest, MakeName) {
   FieldTrial* trial = new FieldTrial("Field Trial", 10);
   trial->AppendGroup("Winner", 10);
   EXPECT_EQ("Histogram_Winner",
             FieldTrial::MakeName("Histogram", "Field Trial"));
 }