Remove unused methods from WebContentsDelegate, WebContentsDelegateAndroid

chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

 // 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 CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
 #define CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
 
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/compiler_specific.h"
@@ skipping 40 matching lines @@
   // Binds this WebContentsDelegateAndroid to the passed WebContents instance,
   // such that when that WebContents is destroyed, this
   // WebContentsDelegateAndroid instance will be destroyed too.
   void SetOwnerWebContents(content::WebContents* contents);
 
   // Overridden from WebContentsDelegate:
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE;
 
-  // Don't merge back.
-  // TODO(mkosiba): Upstream base class's implementaion of this method.
-  virtual bool ShouldIgnoreNavigation(
-      content::WebContents* source,
-      const GURL& url,
-      const content::Referrer& referrer,
-      WindowOpenDisposition disposition,
-      content::PageTransition transition_type);
   virtual void NavigationStateChanged(const content::WebContents* source,
                                       unsigned changed_flags) OVERRIDE;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
   virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
   virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
   virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
   virtual void LoadProgressChanged(content::WebContents* source,
                                    double load_progress) OVERRIDE;
   virtual void CloseContents(content::WebContents* source) OVERRIDE;
   virtual void MoveContents(content::WebContents* source,
                             const gfx::Rect& pos) OVERRIDE;
   virtual bool AddMessageToConsole(content::WebContents* source,
                                    int32 level,
                                    const string16& message,
                                    int32 line_no,
                                    const string16& source_id) OVERRIDE;
   // TODO(merge): WARNING! method no longer available on the base class.
   // See http://crbug.com/149477
   virtual void URLStarredChanged(content::WebContents* source, bool starred);
   virtual void UpdateTargetURL(content::WebContents* source,
                                int32 page_id,
                                const GURL& url) OVERRIDE;
-  virtual bool ShouldOverrideLoading(const GURL& url) OVERRIDE;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
 
  protected:
   base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const;
 
  private:
   // We depend on the java side user of WebContentDelegateAndroid to hold a
   // strong reference to that object as long as they want to receive callbacks
   // on it. Using a weak ref here allows it to be correctly GCed.
   JavaObjectWeakGlobalRef weak_java_delegate_;
 };
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
 
 }  // namespace web_contents_delegate_android
 
 #endif  // CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_