Merge Android RetrieveWebappInformation and Extensions GetApplicationInfo.

chrome/renderer/chrome_render_view_observer.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_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
 #define CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 49 matching lines @@
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   void OnWebUIJavaScript(const base::string16& javascript);
 #endif
 #if defined(ENABLE_EXTENSIONS)
   void OnSetVisuallyDeemphasized(bool deemphasized);
 #endif
 #if defined(OS_ANDROID)
   void OnUpdateTopControlsState(content::TopControlsState constraints,
                                 content::TopControlsState current,
                                 bool animate);
-  void OnRetrieveWebappInformation(const GURL& expected_url);
   void OnRetrieveMetaTagContent(const GURL& expected_url,
                                 const std::string tag_name);
 #endif
+  void OnGetWebApplicationInfo();
   void OnSetClientSidePhishingDetection(bool enable_phishing_detection);
   void OnSetWindowFeatures(const blink::WebWindowFeatures& window_features);
 
   void CapturePageInfoLater(bool preliminary_capture,
                             base::TimeDelta delay);
 
   // Captures the thumbnail and text contents for indexing for the given load
   // ID.  Kicks off analysis of the captured text.
   void CapturePageInfo(bool preliminary_capture);
 
@@ skipping 20 matching lines @@
   // A color page overlay when visually de-emaphasized.
   scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_;
 
   // Used to delay calling CapturePageInfo.
   base::Timer capture_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeRenderViewObserver);
 };
 
 #endif  // CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_