Convert string16 to base::string16 in content.

content/browser/media/media_internals_unittest.cc

 // Copyright (c) 2011 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 "content/browser/media/media_internals.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
@@ skipping 27 matching lines @@
         audio_log_(media_internals_->CreateAudioLog(test_component_)) {
     media_internals_->AddUpdateCallback(update_cb_);
   }
 
   virtual ~MediaInternalsTest() {
     media_internals_->RemoveUpdateCallback(update_cb_);
   }
 
  protected:
   // Extracts and deserializes the JSON update data; merges into |update_data_|.
-  void UpdateCallbackImpl(const string16& update) {
+  void UpdateCallbackImpl(const base::string16& update) {
     // Each update string looks like "<JavaScript Function Name>({<JSON>});", to
     // use the JSON reader we need to strip out the JavaScript code.
     std::string utf8_update = base::UTF16ToUTF8(update);
     const std::string::size_type first_brace = utf8_update.find('{');
     const std::string::size_type last_brace = utf8_update.rfind('}');
     scoped_ptr<base::Value> output_value(base::JSONReader::Read(
         utf8_update.substr(first_brace, last_brace - first_brace + 1)));
     CHECK(output_value);
 
     base::DictionaryValue* output_dict = NULL;
@@ skipping 78 matching lines @@
   ExpectStatus("closed");
 }
 
 INSTANTIATE_TEST_CASE_P(
     MediaInternalsTest, MediaInternalsTest, testing::Values(
         media::AudioLogFactory::AUDIO_INPUT_CONTROLLER,
         media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER,
         media::AudioLogFactory::AUDIO_OUTPUT_STREAM));
 
 }  // namespace content