Removing the code added to make chrome compile on Aura Android.

chrome/browser/ui/browser_navigator_params.h

 // Copyright 2015 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_UI_BROWSER_NAVIGATOR_PARAMS_H_
 #define CHROME_BROWSER_UI_BROWSER_NAVIGATOR_PARAMS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
 // chrome::NavigateParams params(browser, popup_contents);
 // params.source_contents = source_contents;
 // chrome::Navigate(&params);
 //
 // See browser_navigator_browsertest.cc for more examples.
 
 // TODO(thestig): Split or ifdef out more fields that are not used on Android.
 struct NavigateParams {
 #if defined(OS_ANDROID)
   explicit NavigateParams(content::WebContents* a_target_contents);
-#endif
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#else
   NavigateParams(Browser* browser,
                  const GURL& a_url,
                  ui::PageTransition a_transition);
   NavigateParams(Browser* browser,
                  content::WebContents* a_target_contents);
 #endif
   NavigateParams(Profile* profile,
                  const GURL& a_url,
                  ui::PageTransition a_transition);
   ~NavigateParams();
@@ skipping 129 matching lines @@
   // What to do with the ref component of the URL for singleton navigations.
   enum RefBehavior {
     // Two URLs with differing refs are same.
     IGNORE_REF,
     // Two URLs with differing refs are different.
     RESPECT_REF,
   };
   // Default is IGNORE.
   RefBehavior ref_behavior;
 
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   // [in]  Specifies a Browser object where the navigation could occur or the
   //       tab could be added. Navigate() is not obliged to use this Browser if
   //       it is not compatible with the operation being performed. This can be
   //       NULL, in which case |initiating_profile| must be provided.
   // [out] Specifies the Browser object where the navigation occurred or the
   //       tab was added. Guaranteed non-NULL unless the disposition did not
   //       require a navigation, in which case this is set to NULL
   //       (SUPPRESS_OPEN, SAVE_TO_DISK, IGNORE_ACTION).
   // Note: If |show_window| is set to false and a new Browser is created by
   //       Navigate(), the caller is responsible for showing it so that its
@@ skipping 28 matching lines @@
   NavigateParams();
 };
 
 // Copies fields from |params| struct to |nav_params| struct.
 void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params,
                                          const content::OpenURLParams& params);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_PARAMS_H_