Revert 270290 "Reduce creation of ViewsDelegate"

trunk/src/chrome/test/base/browser_with_test_window_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 
 #include "base/at_exit.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 139 matching lines @@
   virtual BrowserWindow* CreateBrowserWindow();
 
   // Creates the browser given |profile|, |browser_type|, |hosted_app|,
   // |host_desktop_type| and |browser_window|. The caller owns the return value.
   virtual Browser* CreateBrowser(Profile* profile,
                                  Browser::Type browser_type,
                                  bool hosted_app,
                                  chrome::HostDesktopType host_desktop_type,
                                  BrowserWindow* browser_window);
 
- private:
-#if !defined(OS_CHROMEOS) && defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS)
   // Creates the ViewsDelegate to use, may be overriden to create a different
   // ViewsDelegate.
-  views::ViewsDelegate* CreateViewsDelegate();
+  virtual views::ViewsDelegate* CreateViewsDelegate();
 #endif
 
+ private:
   // We need to create a MessageLoop, otherwise a bunch of things fails.
   content::TestBrowserThreadBundle thread_bundle_;
   base::ShadowingAtExitManager at_exit_manager_;
 
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   chromeos::ScopedTestUserManager test_user_manager_;
 #endif
 
@@ skipping 29 matching lines @@
   // The desktop to create the initial window on.
   chrome::HostDesktopType host_desktop_type_;
 
   // Whether the browser is part of a hosted app.
   bool hosted_app_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_