Cleanup mojo Wallpaper interfaces for mash.

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 <stddef.h>
 
 #include <vector>
 
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wm_shell.h"
@@ skipping 77 matching lines @@
 
 }  // namespace
 
 // This is helper class for net::FakeURLFetcherFactory.
 class TestWallpaperImageURLFetcherCallback {
  public:
   TestWallpaperImageURLFetcherCallback(
       const GURL& url,
       const size_t require_retries,
       const std::vector<unsigned char>& jpeg_data_raw)
-      : url_(url),
-        require_retries_(require_retries),
-        factory_(NULL) {
+      : url_(url), require_retries_(require_retries), factory_(nullptr) {
     jpeg_data_.resize(jpeg_data_raw.size());
     std::copy(jpeg_data_raw.begin(), jpeg_data_raw.end(), jpeg_data_.begin());
   }
 
   std::unique_ptr<net::FakeURLFetcher> CreateURLFetcher(
       const GURL& url,
       net::URLFetcherDelegate* delegate,
       const std::string& response_data,
       net::HttpStatusCode response_code,
       net::URLRequestStatus::Status status) {
@@ skipping 81 matching lines @@
                   int height,
                   SkColor color,
                   const size_t require_retries) {
     std::vector<unsigned char> oem_wallpaper_;
     ASSERT_TRUE(wallpaper_manager_test_utils::CreateJPEGImage(
         width, height, color, &oem_wallpaper_));
 
     url_callback_.reset(new TestWallpaperImageURLFetcherCallback(
         url, require_retries, oem_wallpaper_));
     fallback_fetcher_factory_.reset(new net::TestURLFetcherFactory);
-    net::URLFetcherImpl::set_factory(NULL);
+    net::URLFetcherImpl::set_factory(nullptr);
     fetcher_factory_.reset(new net::FakeURLFetcherFactory(
         fallback_fetcher_factory_.get(),
         base::Bind(&TestWallpaperImageURLFetcherCallback::CreateURLFetcher,
                    base::Unretained(url_callback_.get()))));
     url_callback_->Initialize(fetcher_factory_.get());
   }
 
   std::unique_ptr<TestWallpaperImageURLFetcherCallback> url_callback_;
 
   // Use a test factory as a fallback so we don't have to deal with other
   // requests.
   std::unique_ptr<net::TestURLFetcherFactory> fallback_fetcher_factory_;
   std::unique_ptr<net::FakeURLFetcherFactory> fetcher_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperImageFetcherFactory);
 };
 
 class CustomizationWallpaperDownloaderBrowserTest
     : public InProcessBrowserTest {
  public:
-  CustomizationWallpaperDownloaderBrowserTest()
-      : controller_(NULL),
-        local_state_(NULL) {
-  }
-
+  CustomizationWallpaperDownloaderBrowserTest() {}
   ~CustomizationWallpaperDownloaderBrowserTest() override {}
 
-  void SetUpOnMainThread() override {
-    controller_ = ash::WmShell::Get()->wallpaper_controller();
-    local_state_ = g_browser_process->local_state();
-  }
-
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
   }
 
-  void TearDownOnMainThread() override { controller_ = NULL; }
-
  protected:
   void CreateCmdlineWallpapers() {
     cmdline_wallpaper_dir_.reset(new base::ScopedTempDir);
     ASSERT_TRUE(cmdline_wallpaper_dir_->CreateUniqueTempDir());
     wallpaper_manager_test_utils::CreateCmdlineWallpapers(
         *cmdline_wallpaper_dir_, &wallpaper_manager_command_line_);
   }
 
-  ash::WallpaperController* controller_;
-  PrefService* local_state_;
   std::unique_ptr<base::CommandLine> wallpaper_manager_command_line_;
 
   // Directory created by CreateCmdlineWallpapersAndSetFlags() to store default
   // wallpaper images.
   std::unique_ptr<base::ScopedTempDir> cmdline_wallpaper_dir_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CustomizationWallpaperDownloaderBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
                        OEMWallpaperIsPresent) {
   CreateCmdlineWallpapers();
   WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
-      controller_->GetWallpaper(),
+      ash::WmShell::Get()->wallpaper_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(),
+      ash::WmShell::Get()->wallpaper_controller()->GetWallpaper(),
       wallpaper_manager_test_utils::kCustomWallpaperColor));
   EXPECT_EQ(1U, url_factory.num_attempts());
 }
 
 IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
                        OEMWallpaperRetryFetch) {
   CreateCmdlineWallpapers();
   WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
-      controller_->GetWallpaper(),
+      ash::WmShell::Get()->wallpaper_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();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
-      controller_->GetWallpaper(),
+      ash::WmShell::Get()->wallpaper_controller()->GetWallpaper(),
       wallpaper_manager_test_utils::kCustomWallpaperColor));
 
   EXPECT_EQ(2U, url_factory.num_attempts());
 }
 
 }  // namespace chromeos