Consolidate manifest handler registration.

chrome/browser/extensions/convert_web_app_unittest.cc

 // 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.
 
 #include "chrome/browser/extensions/convert_web_app.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
-#include "chrome/common/extensions/extension_unittest.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/web_apps.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/url_pattern.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "webkit/glue/image_decoder.h"
 
@@ skipping 42 matching lines @@
   exploded.day_of_month = day;
   exploded.hour = hour;
   exploded.minute = minute;
   exploded.second = second;
   exploded.millisecond = millisecond;
   return base::Time::FromUTCExploded(exploded);
 }
 
 }  // namespace
 
-class ExtensionFromWebApp : public ExtensionTest {
- protected:
-  virtual void SetUp() OVERRIDE {
-    ExtensionTest::SetUp();
-    (new IconsHandler)->Register();
-  }
-};
-
-TEST_F(ExtensionFromWebApp, GenerateVersion) {
+TEST(ExtensionFromWebApp, GenerateVersion) {
   EXPECT_EQ("2010.1.1.0",
             ConvertTimeToExtensionVersion(
                 GetTestTime(2010, 1, 1, 0, 0, 0, 0)));
   EXPECT_EQ("2010.12.31.22111",
             ConvertTimeToExtensionVersion(
                 GetTestTime(2010, 12, 31, 8, 5, 50, 500)));
   EXPECT_EQ("2010.10.1.65535",
             ConvertTimeToExtensionVersion(
                 GetTestTime(2010, 10, 1, 23, 59, 59, 999)));
 }
 
-TEST_F(ExtensionFromWebApp, Basic) {
+TEST(ExtensionFromWebApp, Basic) {
   base::ScopedTempDir extensions_dir;
   ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
 
   WebApplicationInfo web_app;
   web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json");
   web_app.title = ASCIIToUTF16("Gearpad");
   web_app.description = ASCIIToUTF16("The best text editor in the universe!");
   web_app.app_url = GURL("http://aaronboodman.com/gearpad/");
   web_app.permissions.push_back("geolocation");
   web_app.permissions.push_back("notifications");
@@ skipping 37 matching lines @@
     EXPECT_EQ(base::StringPrintf("icons/%i.png", web_app.icons[i].width),
               IconsInfo::GetIcons(extension).Get(
                   web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY));
     ExtensionResource resource = IconsInfo::GetIconResource(
         extension, web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY);
     ASSERT_TRUE(!resource.empty());
     EXPECT_TRUE(file_util::PathExists(resource.GetFilePath()));
   }
 }
 
-TEST_F(ExtensionFromWebApp, Minimal) {
+TEST(ExtensionFromWebApp, Minimal) {
   base::ScopedTempDir extensions_dir;
   ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
 
   WebApplicationInfo web_app;
   web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json");
   web_app.title = ASCIIToUTF16("Gearpad");
   web_app.app_url = GURL("http://aaronboodman.com/gearpad/");
 
   scoped_refptr<Extension> extension = ConvertWebAppToExtension(
       web_app, GetTestTime(1978, 12, 11, 0, 0, 0, 0),
@@ skipping 15 matching lines @@
   EXPECT_EQ("", extension->description());
   EXPECT_EQ(web_app.app_url, extension->GetFullLaunchURL());
   EXPECT_EQ(0u, IconsInfo::GetIcons(extension).map().size());
   EXPECT_EQ(0u, extension->GetActivePermissions()->apis().size());
   ASSERT_EQ(1u, extension->web_extent().patterns().size());
   EXPECT_EQ("*://aaronboodman.com/*",
             extension->web_extent().patterns().begin()->GetAsString());
 }
 
 }  // namespace extensions