Revert of Refactor content/common/gpu into gpu/ipc/service

content/renderer/media/android/webmediaplayer_android.h

 // Copyright 2013 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_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 324 matching lines @@
   // Callback responsible for determining if loading of media should be deferred
   // for external reasons; called during load().
   media::WebMediaPlayerParams::DeferLoadCB defer_load_cb_;
 
   // Save the list of buffered time ranges.
   blink::WebTimeRanges buffered_;
 
   // Size of the video.
   blink::WebSize natural_size_;
 
-  // Size that has been sent to gpu::StreamTexture.
+  // Size that has been sent to StreamTexture.
   blink::WebSize cached_stream_texture_size_;
 
   // The video frame object used for rendering by the compositor.
   scoped_refptr<media::VideoFrame> current_frame_;
   base::Lock current_frame_lock_;
 
   base::ThreadChecker main_thread_checker_;
 
   // Message loop for media thread.
   const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
@@ skipping 161 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_