cbuiv: remove some TOOLKIT_VIEWS checks

TOOLKIT_VIEWS is always defined when building //cbui/views, so these are
dead code.

Bug: None
Change-Id: Id22b091c647c754c52077efbfa0a91da61aa9043
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2199317Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768756}

chrome/browser/ui/views/extensions/browser_action_drag_data.cc

@@ -49,7 +49,6 @@ bool BrowserActionDragData::IsFromProfile(const Profile* profile) const {
   return profile_ == profile;
 }
 
-#if defined(TOOLKIT_VIEWS)
 void BrowserActionDragData::Write(
     Profile* profile, ui::OSExchangeData* data) const {
   DCHECK(data);
@@ -80,7 +79,6 @@ BrowserActionDragData::GetBrowserActionFormatType() {
 
   return *format;
 }
-#endif
 
 void BrowserActionDragData::WriteToPickle(Profile* profile,
                                           base::Pickle* pickle) const {

chrome/browser/ui/views/extensions/browser_action_drag_data.h

@@ -10,10 +10,7 @@
 #include <string>
 
 #include "base/macros.h"
-
-#if defined(TOOLKIT_VIEWS)
 #include "ui/base/dragdrop/os_exchange_data.h"
-#endif
 
 class Profile;
 
@@ -40,7 +37,7 @@ class BrowserActionDragData {
   // Returns true if this data is from the specified profile.
   bool IsFromProfile(const Profile* profile) const;
 
-#if defined(TOOLKIT_VIEWS)
+  // Write data, attributed to the specified profile, to the clipboard.
   void Write(Profile* profile, ui::OSExchangeData* data) const;
 
   // Restores this data from the clipboard, returning true on success.
@@ -48,7 +45,6 @@ class BrowserActionDragData {
 
   // Returns the ClipboardFormatType this class supports (for Browser Actions).
   static const ui::ClipboardFormatType& GetBrowserActionFormatType();
-#endif
 
  private:
   void WriteToPickle(Profile* profile, base::Pickle* pickle) const;

chrome/browser/ui/views/find_bar_views_interactive_uitest.cc

@@ -527,13 +527,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
 // Flaky on Win. http://crbug.com/92467
 // Flaky on ChromeOS. http://crbug.com/118216
 // Flaky on linux aura. http://crbug.com/163931
-#if defined(TOOLKIT_VIEWS)
-#define MAYBE_PasteWithoutTextChange DISABLED_PasteWithoutTextChange
-#else
-#define MAYBE_PasteWithoutTextChange PasteWithoutTextChange
-#endif
-
-IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_PasteWithoutTextChange) {
+IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_PasteWithoutTextChange) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // Make sure Chrome is in the foreground, otherwise sending input

chrome/browser/ui/views/keyboard_access_browsertest.cc

@@ -2,10 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This functionality currently works on Windows and on Linux when
-// toolkit_views is defined (i.e. for Chrome OS). It's not needed
-// on the Mac, and it's not yet implemented on Linux.
-
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"

chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc

@@ -299,7 +299,6 @@ class PageInfoBubbleViewBrowserTest : public DialogBrowserTest {
   bool VerifyUi() override {
     if (!DialogBrowserTest::VerifyUi())
       return false;
-#if defined(TOOLKIT_VIEWS)
     // Check that each expected View is present in the Page Info bubble.
     views::View* page_info_bubble_view =
         PageInfoBubbleView::GetPageInfoBubbleForTesting()->GetContentsView();
@@ -309,10 +308,6 @@ class PageInfoBubbleViewBrowserTest : public DialogBrowserTest {
         return false;
     }
     return true;
-#else
-    NOTIMPLEMENTED();
-    return false;
-#endif
   }
 
  protected: