Chromecast: makes CastWindowAndroid use CastContentWindow.

chromecast/browser/android/cast_window_android.h

Index: chromecast/browser/android/cast_window_android.h
diff --git a/chromecast/browser/android/cast_window_android.h b/chromecast/browser/android/cast_window_android.h
index 281f140ed005c280c6444c0f4b12250658aff372..b0d2930b34deb099d3a24badbf365742aa3ca88c 100644
--- a/chromecast/browser/android/cast_window_android.h
+++ b/chromecast/browser/android/cast_window_android.h
@@ -33,6 +33,7 @@ class WebContents;
 }  // namespace content
 
 namespace chromecast {
+class CastContentWindow;
 namespace shell {
 
 class CastWindowAndroid : public content::WebContentsDelegate,
@@ -76,15 +77,13 @@ class CastWindowAndroid : public content::WebContentsDelegate,
   virtual void RenderProcessGone(base::TerminationStatus status) override;
 
  private:
-  explicit CastWindowAndroid(content::WebContents* web_contents);
+  explicit CastWindowAndroid(content::BrowserContext* browser_context);
+  void Initialize();
 
-  // Helper to create a new CastWindowAndroid given a newly created WebContents.
-  static CastWindowAndroid* CreateCastWindowAndroid(
-      content::WebContents* web_contents,
-      const gfx::Size& initial_size);
-
-  base::android::ScopedJavaGlobalRef<jobject> java_object_;
+  content::BrowserContext* browser_context_;
+  base::android::ScopedJavaGlobalRef<jobject> window_java_;
   scoped_ptr<content::WebContents> web_contents_;
+  scoped_ptr<CastContentWindow> content_window_;
 
   base::WeakPtrFactory<CastWindowAndroid> weak_factory_;