Remove android_java_ui as it is not used

chrome/browser/chrome_content_browser_client.cc

 // 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 240 matching lines @@
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/debug/leak_annotations.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
 #endif
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
 #include "chrome/browser/android/service_tab_launcher.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
 #include "content/public/browser/android/java_interfaces.h"
 #endif
 
 #if defined(OS_ANDROID)

[Ted C, 2017/01/06 22:33:30]

combine with above

[F, 2017/01/09 21:36:32]

Done.

 #include "chrome/browser/android/devtools_manager_delegate_android.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/android/device_display_info.h"
 #else
 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 #endif
@@ skipping 409 matching lines @@
       const std::string& serialized_report) override {
     service_->Send(serialized_report);
   }
 
  private:
   CertificateReportingService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter);
 };
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) {
   WebContents* web_contents = tab_util::GetWebContentsByFrameID(
       params.render_process_id(), params.opener_render_frame_id());
   if (!web_contents)
     return;
 
   SingleTabModeTabHelper::FromWebContents(web_contents)->HandleOpenUrl(params);
 }
-#endif  // BUILDFLAG(ANDROID_JAVA_UI)
+#endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)

[Ted C, 2017/01/06 22:33:30]

combine with above

[F, 2017/01/09 21:36:32]

Done.

 float GetDeviceScaleAdjustment() {
   static const float kMinFSM = 1.05f;
   static const int kWidthForMinFSM = 320;
   static const float kMaxFSM = 1.3f;
   static const int kWidthForMaxFSM = 800;
 
   gfx::DeviceDisplayInfo info;
   int minWidth = info.GetSmallestDIPWidth();
 
   if (minWidth <= kWidthForMinFSM)
@@ skipping 799 matching lines @@
     // this point.
     LOG(WARNING) << "Received field trial params, "
                     "but blink-settings switch already specified.";
     return;
   }
 
   command_line->AppendSwitchASCII(switches::kBlinkSettings,
                                   base::JoinString(blink_settings, ","));
 }
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
 void ForwardShareServiceRequest(
     base::WeakPtr<service_manager::InterfaceProvider> interface_provider,
     blink::mojom::ShareServiceRequest request) {
   if (!interface_provider ||
       ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
     return;
   }
   interface_provider->GetInterface(std::move(request));
 }
 #endif
@@ skipping 830 matching lines @@
                                             std::string()) !=
         CONTENT_SETTING_ALLOW) {
       BrowserThread::PostTask(BrowserThread::UI,
                               FROM_HERE,
                               base::Bind(&HandleBlockedPopupOnUIThread,
                                          blocked_params));
       return false;
     }
   }
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
   if (SingleTabModeTabHelper::IsRegistered(opener_render_process_id,
                                            opener_render_frame_id)) {
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&HandleSingleTabModeBlockOnUIThread,
                                        blocked_params));
     return false;
   }
 #endif
 
@@ skipping 152 matching lines @@
   for (size_t i = 0; i < extra_parts_.size(); ++i)
     extra_parts_[i]->BrowserURLHandlerCreated(handler);
 
   // about: handler. Must come before chrome: handler, since it will
   // rewrite about: urls to chrome: URLs and then expect chrome: to
   // actually handle them.  Also relies on a preliminary fixup phase.
   handler->SetFixupHandler(&FixupBrowserAboutURL);
   handler->AddHandlerPair(&WillHandleBrowserAboutURL,
                           BrowserURLHandler::null_handler());
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
   // Handler to rewrite chrome://newtab on Android.
   handler->AddHandlerPair(&chrome::android::HandleAndroidNativePageURL,
                           BrowserURLHandler::null_handler());
 #else
   // Handler to rewrite chrome://newtab for InstantExtended.
   handler->AddHandlerPair(&search::HandleNewTabURLRewrite,
                           &search::HandleNewTabURLReverseRewrite);
 #endif
 
   // chrome: & friends.
@@ skipping 430 matching lines @@
   registry->AddInterface(
       base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
                      BindPasswordManagerDriver,
                  render_frame_host));
 
   registry->AddInterface(
       base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
                      BindSensitiveInputVisibilityService,
                  render_frame_host));
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   if (web_contents) {
     registry->AddInterface(
         web_contents->GetJavaInterfaces()
             ->CreateInterfaceFactory<payments::mojom::PaymentRequest>());
     registry->AddInterface(
         base::Bind(&ForwardShareServiceRequest,
                    web_contents->GetJavaInterfaces()->GetWeakPtr()));
   }
 #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
   if (AreExperimentalWebPlatformFeaturesEnabled()) {
     content::WebContents* web_contents =
         content::WebContents::FromRenderFrameHost(render_frame_host);
     if (web_contents) {
       registry->AddInterface(
           base::Bind(CreatePaymentRequestHandler, web_contents));
     }
   }
 #endif
 
 #if defined(OS_ANDROID)
   if (AreExperimentalWebPlatformFeaturesEnabled()) {

[Ted C, 2017/01/06 22:33:30]

move up into one above?

[F, 2017/01/09 21:36:32]

Done.

     content::WebContents* web_contents =
         content::WebContents::FromRenderFrameHost(render_frame_host);
     if (web_contents) {
       registry->AddInterface(
           web_contents->GetJavaInterfaces()
               ->CreateInterfaceFactory<blink::mojom::BarcodeDetection>());
     }
   }
 #endif
 
@@ skipping 76 matching lines @@
 #endif  // !defined(DISABLE_NACL)
   });
 }
 
 void ChromeContentBrowserClient::OpenURL(
     content::BrowserContext* browser_context,
     const content::OpenURLParams& params,
     const base::Callback<void(content::WebContents*)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
   ServiceTabLauncher::GetInstance()->LaunchTab(browser_context, params,
                                                callback);
 #else
   chrome::NavigateParams nav_params(
       Profile::FromBrowserContext(browser_context),
       params.url,
       params.transition);
   FillNavigateParamsFromOpenURLParams(&nav_params, params);
   nav_params.user_gesture = params.user_gesture;
 
@@ skipping 227 matching lines @@
 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true";
 }
 
 bool ChromeContentBrowserClient::
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }