Cleanup namespace usage in Source/web/Web*.h

Source/web/WebMediaPlayerClientImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "platform/audio/AudioSourceProvider.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "public/platform/WebAudioSourceProviderClient.h"
 #include "public/platform/WebMediaPlayerClient.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
 namespace blink {
+
 class AudioSourceProviderClient;
 class HTMLMediaElement;
-}
-
-namespace blink {
-
 class WebAudioSourceProvider;
 class WebContentDecryptionModule;
 class WebMediaPlayer;
 
-// This class serves as a bridge between blink::MediaPlayer and
-// blink::WebMediaPlayer.
-class WebMediaPlayerClientImpl FINAL : public blink::MediaPlayer, public WebMediaPlayerClient {
+// This class serves as a bridge between MediaPlayer and
+// WebMediaPlayer.
+class WebMediaPlayerClientImpl FINAL : public MediaPlayer, public WebMediaPlayerClient {
 
 public:
-    static PassOwnPtr<blink::MediaPlayer> create(blink::MediaPlayerClient*);
+    static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*);
 
     virtual ~WebMediaPlayerClientImpl();
 
     // WebMediaPlayerClient methods:
     virtual void networkStateChanged() OVERRIDE;
     virtual void readyStateChanged() OVERRIDE;
     virtual void timeChanged() OVERRIDE;
     virtual void repaint() OVERRIDE;
     virtual void durationChanged() OVERRIDE;
     virtual void sizeChanged() OVERRIDE;
@@ skipping 12 matching lines @@
     virtual void removeVideoTrack(WebMediaPlayer::TrackId) OVERRIDE;
     virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;
     virtual void requestFullscreen() OVERRIDE;
     virtual void requestSeek(double) OVERRIDE;
 
     // MediaPlayer methods:
     virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
     virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
-    virtual void setPreload(blink::MediaPlayer::Preload) OVERRIDE;
+    virtual void setPreload(MediaPlayer::Preload) OVERRIDE;
 
 #if ENABLE(WEB_AUDIO)
-    virtual blink::AudioSourceProvider* audioSourceProvider() OVERRIDE;
+    virtual AudioSourceProvider* audioSourceProvider() OVERRIDE;
 #endif
 
 private:
-    explicit WebMediaPlayerClientImpl(blink::MediaPlayerClient*);
+    explicit WebMediaPlayerClientImpl(MediaPlayerClient*);
 
-    blink::HTMLMediaElement& mediaElement() const;
+    HTMLMediaElement& mediaElement() const;
 
-    blink::MediaPlayerClient* m_client;
+    MediaPlayerClient* m_client;
     OwnPtr<WebMediaPlayer> m_webMediaPlayer;
 
 #if ENABLE(WEB_AUDIO)
     // AudioClientImpl wraps an AudioSourceProviderClient.
     // When the audio format is known, Chromium calls setFormat() which then dispatches into WebCore.
 
-    class AudioClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<AudioClientImpl>, public blink::WebAudioSourceProviderClient {
+    class AudioClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<AudioClientImpl>, public WebAudioSourceProviderClient {
     public:
-        explicit AudioClientImpl(blink::AudioSourceProviderClient* client)
+        explicit AudioClientImpl(AudioSourceProviderClient* client)
             : m_client(client)
         {
         }
 
         virtual ~AudioClientImpl() { }
 
         // WebAudioSourceProviderClient
         virtual void setFormat(size_t numberOfChannels, float sampleRate) OVERRIDE;
 
         void trace(Visitor*);
 
     private:
-        RawPtrWillBeMember<blink::AudioSourceProviderClient> m_client;
+        RawPtrWillBeMember<AudioSourceProviderClient> m_client;
     };
 
     // AudioSourceProviderImpl wraps a WebAudioSourceProvider.
     // provideInput() calls into Chromium to get a rendered audio stream.
 
-    class AudioSourceProviderImpl FINAL : public blink::AudioSourceProvider {
+    class AudioSourceProviderImpl FINAL : public AudioSourceProvider {
     public:
         AudioSourceProviderImpl()
             : m_webAudioSourceProvider(0)
         {
         }
 
         virtual ~AudioSourceProviderImpl() { }
 
         // Wraps the given WebAudioSourceProvider.
         void wrap(WebAudioSourceProvider*);
 
-        // blink::AudioSourceProvider
-        virtual void setClient(blink::AudioSourceProviderClient*) OVERRIDE;
-        virtual void provideInput(blink::AudioBus*, size_t framesToProcess) OVERRIDE;
+        // AudioSourceProvider
+        virtual void setClient(AudioSourceProviderClient*) OVERRIDE;
+        virtual void provideInput(AudioBus*, size_t framesToProcess) OVERRIDE;
 
     private:
         WebAudioSourceProvider* m_webAudioSourceProvider;
         OwnPtrWillBePersistent<AudioClientImpl> m_client;
         Mutex provideInputLock;
     };
 
     AudioSourceProviderImpl m_audioSourceProvider;
 #endif
 };
 
 } // namespace blink
 
 #endif