Convert string16 to base::string16 in content.

content/browser/media/media_internals.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_
 #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
  public:
   static MediaInternals* GetInstance();
 
   virtual ~MediaInternals();
 
   // Called when a MediaEvent occurs.
   void OnMediaEvents(int render_process_id,
                      const std::vector<media::MediaLogEvent>& events);
 
   // Called with the update string.
-  typedef base::Callback<void(const string16&)> UpdateCallback;
+  typedef base::Callback<void(const base::string16&)> UpdateCallback;
 
   // Add/remove update callbacks (see above).  Must be called on the IO thread.
   void AddUpdateCallback(const UpdateCallback& callback);
   void RemoveUpdateCallback(const UpdateCallback& callback);
 
   // Sends all cached data to each registered UpdateCallback.
   void SendEverything();
 
   // AudioLogFactory implementation.  Safe to call from any thread.
   virtual scoped_ptr<media::AudioLog> CreateAudioLog(
       AudioComponent component) OVERRIDE;
 
  private:
   friend class AudioLogImpl;
   friend class MediaInternalsTest;
   friend struct base::DefaultLazyInstanceTraits<MediaInternals>;
 
   MediaInternals();
 
   // Sends |update| to each registered UpdateCallback.  Safe to call from any
   // thread, but will forward to the IO thread.
-  void SendUpdate(const string16& update);
+  void SendUpdate(const base::string16& update);
 
   // Caches |value| under |cache_key| so that future SendEverything() calls will
   // include the current data.  Calls JavaScript |function|(|value|) for each
   // registered UpdateCallback.  SendUpdateAndPurgeCache() is similar but purges
   // the cache entry after completion instead.
   void SendUpdateAndCache(const std::string& cache_key,
                           const std::string& function,
                           const base::DictionaryValue* value);
   void SendUpdateAndPurgeCache(const std::string& cache_key,
                                const std::string& function,
                                const base::DictionaryValue* value);
   // Must only be accessed on the IO thread.
   std::vector<UpdateCallback> update_callbacks_;
 
   // All variables below must be accessed under |lock_|.
   base::Lock lock_;
   base::DictionaryValue cached_data_;
   int owner_ids_[AUDIO_COMPONENT_MAX];
 
   DISALLOW_COPY_AND_ASSIGN(MediaInternals);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_