Move Requirements out of Extension Class

chrome/browser/extensions/extension_toolbar_model_browsertest.cc

 // Copyright (c) 2011 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_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 11 matching lines @@
  public:
   virtual void SetUp() {
     inserted_count_ = 0;
     removed_count_ = 0;
     moved_count_ = 0;
 
     ExtensionBrowserTest::SetUp();
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
+    ExtensionBrowserTest::SetUpOnMainThread();
     ExtensionService* service = extensions::ExtensionSystem::Get(
         browser()->profile())->extension_service();
     model_ = service->toolbar_model();
     model_->AddObserver(this);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     model_->RemoveObserver(this);
+    ExtensionBrowserTest::CleanUpOnMainThread();
   }
 
   virtual void BrowserActionAdded(const Extension* extension,
                                   int index) OVERRIDE {
     inserted_count_++;
   }
 
   virtual void BrowserActionRemoved(const Extension* extension) OVERRIDE {
     removed_count_++;
   }
@@ skipping 177 matching lines @@
 
   // Load extension C again.
   ASSERT_TRUE(LoadExtension(extension_c_path));
 
   // Extension C loaded again.
   EXPECT_EQ(5, inserted_count_);
   EXPECT_EQ(2u, model_->toolbar_items().size());
   // Make sure it gets its old spot in the list (at the very end).
   ASSERT_STREQ(idC.c_str(), ExtensionAt(1)->id().c_str());
 }