Contextual Search Panel should own ContentViewCore

chrome/browser/android/contextualsearch/contextual_search_manager.h

Index: chrome/browser/android/contextualsearch/contextual_search_manager.h
diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.h b/chrome/browser/android/contextualsearch/contextual_search_manager.h
index 5fd7211789af7457a534241f1d6185a36b819ede..f9e76039d6d8cfc68e7418b4257ca3326c1c472b 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_manager.h
+++ b/chrome/browser/android/contextualsearch/contextual_search_manager.h
@@ -10,14 +10,6 @@
 #include "chrome/browser/android/contextualsearch/contextual_search_context.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
 
-namespace content {
-class WebContents;
-}  // namespace content
-
-namespace web_contents_delegate_android {
-class WebContentsDelegateAndroid;
-}  // namespace web_contents_delegate_android
-
 // Manages the native extraction and request logic for Contextual Search,
 // and interacts with the Java ContextualSearchManager for UX.
 // Most of the work is done by the associated ContextualSearchDelegate.
@@ -54,35 +46,6 @@ class ContextualSearchManager {
                              jobject j_base_content_view_core,
                              jboolean j_may_send_base_page_url);
 
-  // Removes a search URL from history. |search_start_time_ms| represents the
-  // time at which |search_url| was committed.
-  void RemoveLastSearchVisit(JNIEnv* env,
-                             jobject obj,
-                             jstring search_url,
-                             jlong search_start_time_ms);
-
-  // Takes ownership of the WebContents associated with the given
-  // |ContentViewCore| which holds the Contextual Search Results.
-  void SetWebContents(JNIEnv* env, jobject obj, jobject jcontent_view_core,
-                      jobject jweb_contents_delegate);
-
-  // Destroys the WebContents.
-  void DestroyWebContents(JNIEnv* env, jobject jobj);
-
-  // Release ownership of WebContents.
-  void ReleaseWebContents(JNIEnv* env, jobject jobj);
-
-  // Destroys the WebContents of a ContentViewCore.
-  void DestroyWebContentsFromContentViewCore(JNIEnv* env,
-                                             jobject jobj,
-                                             jobject jcontent_view_core);
-
-  // Sets the delegate used to convert navigations to intents.
-  void SetInterceptNavigationDelegate(JNIEnv* env,
-                                      jobject obj,
-                                      jobject delegate,
-                                      jobject jweb_contents);
-
  private:
   // TODO(donnd): encapsulate these response parameters?
   void OnSearchTermResolutionResponse(bool is_invalid,
@@ -110,14 +73,6 @@ class ContextualSearchManager {
   // The delegate we're using the do the real work.
   scoped_ptr<ContextualSearchDelegate> delegate_;
 
-  // Used if we need to clear history.
-  base::CancelableTaskTracker history_task_tracker_;
-
-  // The WebContents that holds the Contextual Search Results.
-  scoped_ptr<content::WebContents> web_contents_;
-  scoped_ptr<web_contents_delegate_android::WebContentsDelegateAndroid>
-      web_contents_delegate_;
-
   DISALLOW_COPY_AND_ASSIGN(ContextualSearchManager);
 };