Set the window state consistently

chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc

 // Copyright 2014 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 <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 59 matching lines @@
   void OnWallpaperAnimationFinished(const std::string&) override {
     finished_ = true;
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void WaitForWallpaperAnimationFinished() {
     while (!finished_)
       base::RunLoop().Run();
   }
 
+  static void WaitForWallpaperAnimated() {
+    TestWallpaperObserver observer(WallpaperManager::Get());
+    observer.WaitForWallpaperAnimationFinished();
+  }
+
  private:
   bool finished_;
   WallpaperManager* wallpaper_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWallpaperObserver);
 };
 
 }  // namespace
 
 // This is helper class for net::FakeURLFetcherFactory.
@@ skipping 163 matching lines @@
   // wallpaper images.
   scoped_ptr<base::ScopedTempDir> cmdline_wallpaper_dir_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CustomizationWallpaperDownloaderBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
                        OEMWallpaperIsPresent) {
   CreateCmdlineWallpapers();
+  TestWallpaperObserver::WaitForWallpaperAnimated();
+
   WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
-  wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
+  TestWallpaperObserver::WaitForWallpaperAnimated();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
 
   WallpaperImageFetcherFactory url_factory(
       GURL(kOEMWallpaperURL),
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kCustomWallpaperColor,
       0 /* require_retries */);
 
   TestWallpaperObserver observer(WallpaperManager::Get());
   chromeos::ServicesCustomizationDocument* customization =
       chromeos::ServicesCustomizationDocument::GetInstance();
   EXPECT_TRUE(
       customization->LoadManifestFromString(std::string(kServicesManifest)));
 
   observer.WaitForWallpaperAnimationFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kCustomWallpaperColor));
   EXPECT_EQ(1U, url_factory.num_attempts());
 }
 
 IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
                        OEMWallpaperRetryFetch) {
   CreateCmdlineWallpapers();
+  TestWallpaperObserver::WaitForWallpaperAnimated();
+
+  TestWallpaperObserver observer2(WallpaperManager::Get());
   WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
-  wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
+  TestWallpaperObserver::WaitForWallpaperAnimated();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
 
   WallpaperImageFetcherFactory url_factory(
       GURL(kOEMWallpaperURL),
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kCustomWallpaperColor,
       1 /* require_retries */);
 
-  TestWallpaperObserver observer(WallpaperManager::Get());
   chromeos::ServicesCustomizationDocument* customization =
       chromeos::ServicesCustomizationDocument::GetInstance();
   EXPECT_TRUE(
       customization->LoadManifestFromString(std::string(kServicesManifest)));
 
-  observer.WaitForWallpaperAnimationFinished();
+  TestWallpaperObserver::WaitForWallpaperAnimated();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kCustomWallpaperColor));
 
   EXPECT_EQ(2U, url_factory.num_attempts());
 }
 
 }  // namespace chromeos