Consolidate manifest handler registration.

chrome/browser/extensions/extension_icon_manager_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 "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_unittest.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/id_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/skia_util.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::Manifest;
 
 // Our test class that takes care of managing the necessary threads for loading
 // extension icons, and waiting for those loads to happen.
-class ExtensionIconManagerTest : public extensions::ExtensionTest {
+class ExtensionIconManagerTest : public testing::Test {
  public:
   ExtensionIconManagerTest() :
       unwaited_image_loads_(0),
       waiting_(false),
       ui_thread_(BrowserThread::UI, &ui_loop_),
       file_thread_(BrowserThread::FILE),
       io_thread_(BrowserThread::IO) {}
 
   virtual ~ExtensionIconManagerTest() {}
 
   void ImageLoadObserved() {
     unwaited_image_loads_++;
     if (waiting_) {
       MessageLoop::current()->Quit();
     }
   }
 
   void WaitForImageLoad() {
     if (unwaited_image_loads_ == 0) {
       waiting_ = true;
       MessageLoop::current()->Run();
       waiting_ = false;
     }
     ASSERT_GT(unwaited_image_loads_, 0);
     unwaited_image_loads_--;
   }
 
  private:
   virtual void SetUp() {
-    extensions::ExtensionTest::SetUp();
     file_thread_.Start();
     io_thread_.Start();
   }
 
   // The number of observed image loads that have not been waited for.
   int unwaited_image_loads_;
 
   // Whether we are currently waiting for an image load.
   bool waiting_;
 
@@ skipping 110 matching lines @@
   // Now re-load the icon - we should get the same result bitmap (and not the
   // default icon).
   icon_manager.LoadIcon(profile.get(), extension.get());
   WaitForImageLoad();
   SkBitmap second_icon = icon_manager.GetIcon(extension->id());
   EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon));
 
   EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon));
 }
 #endif