Revert 219204 "Attempt headless on win aura content_shell"

> Attempt headless on win aura content_shell
> 
> Just headless failed on the plain Windows build, for reasons unclear.
> Seems worth trying again on Aura. (Another possiblity if this fails on
> bots might be to create and update the main window, but just not Show
> it?)
> 
> R=jochen@chromium.org
> BUG=257219
> 
> Review URL: https://chromiumcodereview.appspot.com/22887038

TBR=dpranke@chromium.org

Review URL: https://codereview.chromium.org/22859065

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219311 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 14 deletions

diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc
index ba3366e..d2d3c38 100644
--- a/content/shell/browser/shell_aura.cc
+++ b/content/shell/browser/shell_aura.cc
@@ -304,8 +304,7 @@ void Shell::PlatformExit() {
   std::vector<Shell*> windows = windows_;
   for (std::vector<Shell*>::iterator it = windows.begin();
        it != windows.end(); ++it) {
-    if (!(*it)->headless_)
-      (*it)->window_widget_->Close();
+    (*it)->window_widget_->Close();
   }
 #if defined(OS_CHROMEOS)
   if (minimal_shell_)
@@ -323,8 +322,6 @@ void Shell::PlatformCleanUp() {
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
-  if (headless_)
-    return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   if (control == BACK_BUTTON) {
@@ -340,8 +337,6 @@ void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
 }
 
 void Shell::PlatformSetAddressBarURL(const GURL& url) {
-  if (headless_)
-    return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetAddressBarURL(url);
@@ -351,8 +346,6 @@ void Shell::PlatformSetIsLoading(bool loading) {
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
-  if (headless_)
-    return;
 #if defined(OS_CHROMEOS)
   window_widget_ =
       views::Widget::CreateWindowWithContextAndBounds(
@@ -373,8 +366,6 @@ void Shell::PlatformCreateWindow(int width, int height) {
 }
 
 void Shell::PlatformSetContents() {
-  if (headless_)
-    return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWebContents(web_contents_.get());
@@ -384,14 +375,10 @@ void Shell::PlatformResizeSubViews() {
 }
 
 void Shell::Close() {
-  if (headless_)
-    return;
   window_widget_->CloseNow();
 }
 
 void Shell::PlatformSetTitle(const string16& title) {
-  if (headless_)
-    return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);