[Android] Add proxy for Java-based WebContentsObservers

content/browser/android/web_contents_observer_proxy.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.

[Yaron, 2015/02/27 19:34:57]

I think you're missing a gyp file change for the rename

[jdduke (slow), 2015/03/03 17:05:17]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_
-#define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_
+#ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_
+#define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/basictypes.h"
 #include "base/process/kill.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class RenderViewHost;
 class WebContents;
 
 // Extends WebContentsObserver for providing a public Java API for some of the
 // the calls it receives.
-class WebContentsObserverAndroid : public WebContentsObserver {
+class WebContentsObserverProxy : public WebContentsObserver {
  public:
-  WebContentsObserverAndroid(JNIEnv* env,
-                             jobject obj,
-                             WebContents* web_contents);
-  ~WebContentsObserverAndroid() override;
+  WebContentsObserverProxy(JNIEnv* env, jobject obj, WebContents* web_contents);
+  ~WebContentsObserverProxy() override;
 
   void Destroy(JNIEnv* env, jobject obj);
 
  private:
   void RenderViewReady() override;
   void RenderProcessGone(base::TerminationStatus termination_status) override;
   void DidStartLoading(RenderViewHost* render_view_host) override;
   void DidStopLoading(RenderViewHost* render_view_host) override;
   void DidFailProvisionalLoad(RenderFrameHost* render_frame_host,
                               const GURL& validated_url,
@@ skipping 32 matching lines @@
       NavigationController::ReloadType reload_type) override;
 
   void DidFailLoadInternal(bool is_provisional_load,
                            bool is_main_frame,
                            int error_code,
                            const base::string16& description,
                            const GURL& url);
 
   JavaObjectWeakGlobalRef weak_java_observer_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebContentsObserverAndroid);
+  DISALLOW_COPY_AND_ASSIGN(WebContentsObserverProxy);
 };
 
-bool RegisterWebContentsObserverAndroid(JNIEnv* env);
+bool RegisterWebContentsObserverProxy(JNIEnv* env);
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_
+#endif  // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_