Make Android notifications rely on the native notification flag

chrome/browser/notifications/platform_notification_service_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
@@ skipping 147 matching lines @@
     display_service()->GetDisplayed(base::Bind(
         &PlatformNotificationServiceTest::DidGetDisplayedNotifications,
         base::Unretained(this)));
     base::RunLoop().RunUntilIdle();
 
     EXPECT_TRUE(displayed_notifications_.get());
     return displayed_notifications_->size();
   }
 
   Notification GetDisplayedNotification() {
-#if defined(OS_ANDROID)
-    return static_cast<StubNotificationPlatformBridge*>(
-               g_browser_process->notification_platform_bridge())
-        ->GetNotificationAt(profile_->GetPath().BaseName().value(), 0);
-#elif BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
+#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
     if (base::FeatureList::IsEnabled(features::kNativeNotifications)) {
       return static_cast<StubNotificationPlatformBridge*>(
                  g_browser_process->notification_platform_bridge())
           ->GetNotificationAt(profile_->GetPath().BaseName().value(), 0);
     } else {
       return static_cast<StubNotificationUIManager*>(
                  g_browser_process->notification_ui_manager())
           ->GetNotificationAt(0);
     }
 #else
@@ skipping 254 matching lines @@
       profile(),
       GURL() /* service_worker_scope */,
       GURL("chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"),
       notification_data, NotificationResources(),
       new MockNotificationDelegate("hello"));
   EXPECT_EQ("NotificationTest",
             base::UTF16ToUTF8(notification.context_message()));
 }
 
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)