Move Extension into extensions namespace

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_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
+using extensions::Extension;
+
 // An InProcessBrowserTest for testing the ExtensionToolbarModel.
 // TODO(erikkay) It's unfortunate that this needs to be an in-proc browser test.
 // It would be nice to refactor things so that ExtensionService could run
 // without so much of the browser in place.
 class ExtensionToolbarModelTest : public ExtensionBrowserTest,
                                   public ExtensionToolbarModel::Observer {
  public:
   virtual void SetUp() {
     inserted_count_ = 0;
     removed_count_ = 0;
@@ skipping 18 matching lines @@
 
   virtual void BrowserActionRemoved(const Extension* extension) {
     removed_count_++;
   }
 
   virtual void BrowserActionMoved(const Extension* extension, int index) {
     moved_count_++;
   }
 
   const Extension* ExtensionAt(int index) {
-    for (ExtensionList::iterator i = model_->begin(); i < model_->end(); ++i) {
+    for (extensions::ExtensionList::iterator i = model_->begin();
+         i < model_->end(); ++i) {
       if (index-- == 0)
         return *i;
     }
     return NULL;
   }
 
  protected:
   ExtensionToolbarModel* model_;
 
   int inserted_count_;
@@ skipping 157 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_->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());
 }