Rolling back change 22245.

chrome/browser/extensions/extension_shelf_model_unittest.cc

 // Copyright (c) 2009 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/browser.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_shelf_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
@@ skipping 62 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionShelfModelTest, Basic) {
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("good")
                                           .AppendASCII("Extensions")
                                           .AppendASCII(kExtensionId)
                                           .AppendASCII("1.0.0.0")));
 
   // extension1 has two toolstrips
   EXPECT_EQ(inserted_count_, 2);
-  ExtensionHost* one = model_->ToolstripAt(0).host;
-  ExtensionHost* two = model_->ToolstripAt(1).host;
+  ExtensionHost* one = model_->ToolstripAt(0);
+  ExtensionHost* two = model_->ToolstripAt(1);
   EXPECT_EQ(one->GetURL().path(), "/toolstrip1.html");
   EXPECT_EQ(two->GetURL().path(), "/toolstrip2.html");
 
   model_->MoveToolstripAt(0, 1);
-  EXPECT_EQ(two, model_->ToolstripAt(0).host);
-  EXPECT_EQ(one, model_->ToolstripAt(1).host);
+  EXPECT_EQ(two, model_->ToolstripAt(0));
+  EXPECT_EQ(one, model_->ToolstripAt(1));
   EXPECT_EQ(moved_count_, 1);
 
   model_->RemoveToolstripAt(0);
-  EXPECT_EQ(one, model_->ToolstripAt(0).host);
+  EXPECT_EQ(one, model_->ToolstripAt(0));
   EXPECT_EQ(1, model_->count());
   EXPECT_EQ(removed_count_, 1);
 }