Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

content/public/browser/android/content_view.h

Index: content/public/browser/android/content_view.h
diff --git a/content/public/browser/android/content_view.h b/content/public/browser/android/content_view.h
deleted file mode 100644
index 95d1fbfaa44cb993ebf20448672ee2758216383d..0000000000000000000000000000000000000000
--- a/content/public/browser/android/content_view.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// 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_PUBLIC_BROWSER_CONTENT_VIEW_H_
-#define CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_H_
-
-#include <jni.h>
-
-class GURL;
-
-namespace content {
-
-class WebContents;
-
-// Native side of the ContentView.java, the primary FrameLayout of
-// Chromium on Android.  This is a public interface used by native
-// code outside of the content module.
-//
-// TODO(jrg): this is a shell.  Upstream the rest.
-//
-// TODO(jrg): downstream, this class derives from
-// base::SupportsWeakPtr<ContentView>.  Issues raised in
-// http://codereview.chromium.org/10536066/ make us want to rethink
-// ownership issues.
-// FOR THE MERGE (downstream), re-add derivation from
-// base::SupportsWeakPtr<ContentView> to keep everything else working
-// until this issue is resolved.
-// http://b/6666045
-class ContentView {
- public:
-  virtual void Destroy(JNIEnv* env, jobject obj) = 0;
-
-  static ContentView* Create(JNIEnv* env, jobject obj,
-                             WebContents* web_contents);
-  static ContentView* GetNativeContentView(JNIEnv* env, jobject obj);
-
-  // --------------------------------------------------------------------------
-  // Public methods that call to Java via JNI
-  // --------------------------------------------------------------------------
-
-  virtual void StartContentIntent(const GURL& content_url) = 0;
-
- protected:
-  virtual ~ContentView() {};
-};
-
-};  // namespace content
-
-#endif  // CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_H_