Revert of retry r266042:

ui/views/controls/scroll_view.cc

Index: ui/views/controls/scroll_view.cc
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index e20f396825a8078884a71d0622284c97a901c649..297be034ae7bcc95f5b51b6de5c1d2debd6ae685 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -20,16 +20,23 @@
 // Subclass of ScrollView that resets the border when the theme changes.
 class ScrollViewWithBorder : public views::ScrollView {
  public:
-  ScrollViewWithBorder() {}
+  ScrollViewWithBorder() {
+    SetThemeSpecificState();
+  }
 
   // View overrides;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE {
+    SetThemeSpecificState();
+  }
+
+ private:
+  void SetThemeSpecificState() {
     SetBorder(Border::CreateSolidBorder(
         1,
-        theme->GetSystemColor(ui::NativeTheme::kColorId_UnfocusedBorderColor)));
-  }
-
- private:
+        GetNativeTheme()->GetSystemColor(
+            ui::NativeTheme::kColorId_UnfocusedBorderColor)));
+  }
+
   DISALLOW_COPY_AND_ASSIGN(ScrollViewWithBorder);
 };