| Index: chrome/browser/chromeos/extensions/wallpaper_apitest.cc
|
| diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_apitest.cc b/chrome/browser/chromeos/extensions/wallpaper_apitest.cc
|
| similarity index 54%
|
| copy from chrome/browser/chromeos/extensions/wallpaper_private_apitest.cc
|
| copy to chrome/browser/chromeos/extensions/wallpaper_apitest.cc
|
| index 80fbb8b8a9f6f0b258851e5e4e2e82d3096411a3..66e69e511f818afc2ef89c1732bf78d1d9d3bc63 100644
|
| --- a/chrome/browser/chromeos/extensions/wallpaper_private_apitest.cc
|
| +++ b/chrome/browser/chromeos/extensions/wallpaper_apitest.cc
|
| @@ -1,13 +1,12 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// 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 "chrome/browser/extensions/extension_apitest.h"
|
| #include "net/dns/mock_host_resolver.h"
|
|
|
| -// Flaky. See http://crbug.com/262854 .
|
| -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WallpaperPicker) {
|
| +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Wallpaper) {
|
| host_resolver()->AddRule("a.com", "127.0.0.1");
|
| ASSERT_TRUE(StartEmbeddedTestServer());
|
| - ASSERT_TRUE(RunComponentExtensionTest("wallpaper_manager")) << message_;
|
| + ASSERT_TRUE(RunExtensionTest("wallpaper")) << message_;
|
| }
|
|
|