Add base:: to string16 in chrome_frame/.

chrome_frame/test/test_scrubber.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.
 
 // The test scrubber uses a Google Test event listener to trigger scrubs.
 // Scrubs are performed at the start of the test program and at the conclusion
 // of each test.
 
 #include "chrome_frame/test/test_scrubber.h"
 
@@ skipping 56 matching lines @@
       scrubber_->CleanUpFromTestRun();
     }
 
    private:
     TestScrubber* scrubber_;
     DISALLOW_COPY_AND_ASSIGN(EventListener);
   };
 
   bool is_initialized() const { return !default_data_directory_.empty(); }
 
-  string16 default_data_directory_;
-  string16 data_directory_override_;
+  base::string16 default_data_directory_;
+  base::string16 data_directory_override_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScrubber);
 };
 
 TestScrubber::TestScrubber() {
 }
 
 TestScrubber::~TestScrubber() {
 }
 
@@ skipping 49 matching lines @@
 
 void OverrideDataDirectoryForThisTest(
     const base::StringPiece16& user_data_dir) {
   // Must be called within the context of a test.
   DCHECK(testing::UnitTest::GetInstance()->current_test_info());
 
   g_scrubber.Get().set_data_directory_override(user_data_dir);
 }
 
 }  // namespace chrome_frame_test