Revert 231699 "Remove kNaturalScrollDefault."

trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.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/ui/views/ash/tab_scrubber.h"
 
 #include "ash/display/event_transformation_handler.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 23 matching lines @@
 namespace {
 
 class TabScrubberTest : public InProcessBrowserTest,
                         public TabStripModelObserver {
  public:
   TabScrubberTest()
       : target_index_(-1) {
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+#if defined(OS_CHROMEOS)
+    command_line->AppendSwitch(chromeos::switches::kNaturalScrollDefault);
+#endif
     command_line->AppendSwitch(switches::kOpenAsh);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     TabScrubber::GetInstance()->set_activation_delay(0);
 
     // Disable external monitor scaling of coordinates.
     ash::Shell* shell = ash::Shell::GetInstance();
     shell->event_transformation_handler()->set_transformation_mode(
         ash::internal::EventTransformationHandler::TRANSFORM_NONE);
-
-    ui::SetNaturalScroll(true);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     browser()->tab_strip_model()->RemoveObserver(this);
   }
 
   TabStrip* GetTabStrip(Browser* browser) {
     aura::Window* window = browser->window()->GetNativeWindow();
     return BrowserView::GetBrowserViewForNativeWindow(window)->tabstrip();
   }
@@ skipping 348 matching lines @@
 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) {
   AddTabs(browser(), 1);
 
   SendScrubEvent(browser(), 0);
   EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
   browser()->window()->Close();
   EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());
 }
 
 #endif // OS_CHROMEOS