Revert of Change focus indicator for TableView and TreeView.

ui/views/controls/scroll_view.h

Index: ui/views/controls/scroll_view.h
diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
index af9111a05cae1a2dd25daba64afe629560c7751e..db38b2c8e7560cab7415c0d73caf48124207afcc 100644
--- a/ui/views/controls/scroll_view.h
+++ b/ui/views/controls/scroll_view.h
@@ -45,10 +45,6 @@
 
   // Creates a ScrollView with a theme specific border.
   static ScrollView* CreateScrollViewWithBorder();
-
-  // Returns the ScrollView for which |contents| is its contents, or null if
-  // |contents| is not in a ScrollView.
-  static ScrollView* GetScrollViewForContents(View* contents);
 
   // Set the contents. Any previous contents will be deleted. The contents
   // is the view that needs to scroll.
@@ -92,8 +88,8 @@
   void SetHorizontalScrollBar(ScrollBar* horiz_sb);
   void SetVerticalScrollBar(ScrollBar* vert_sb);
 
-  // Sets whether this ScrollView has a focus indicator or not.
-  void SetHasFocusIndicator(bool has_focus_indicator);
+  // Sets whether this ScrollView has a focus ring or not.
+  void SetHasFocusRing(bool has_focus_ring);
 
   // View overrides:
   gfx::Size GetPreferredSize() const override;
@@ -104,7 +100,6 @@
   void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   const char* GetClassName() const override;
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // ScrollBarController overrides:
   void ScrollToPosition(ScrollBar* source, int position) override;
@@ -159,9 +154,6 @@
   // Horizontally scrolls the header (if any) to match the contents.
   void ScrollHeader();
 
-  void AddBorder();
-  void UpdateBorder();
-
   // The current contents and its viewport. |contents_| is contained in
   // |contents_viewport_|.
   View* contents_;
@@ -193,13 +185,6 @@
   // If true, never show the horizontal scrollbar (even if the contents is wider
   // than the viewport).
   bool hide_horizontal_scrollbar_;
-
-  // In Harmony, the indicator is a focus ring. Pre-Harmony, the indicator is a
-  // different border painter.
-  bool draw_focus_indicator_ = false;
-
-  // Only needed for pre-Harmony. Remove when Harmony is default.
-  bool draw_border_ = false;
 
   // Focus ring, if one is installed.
   View* focus_ring_ = nullptr;