add mole info to toolstrip definition and enable moles

chrome/browser/extensions/extensions_service_unittest.cc

Index: chrome/browser/extensions/extensions_service_unittest.cc
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 2b1492d06655ebee1fb414201e5a1be5d9b40cf8..e6dd4875f2abda71f0f00e5413378d321094bfba 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -521,7 +521,8 @@ TEST_F(ExtensionsServiceTest, LoadAllExtensionsFromDirectorySuccess) {
 
   Extension* extension = loaded_[0];
   const UserScriptList& scripts = extension->content_scripts();
-  const std::vector<std::string>& toolstrips = extension->toolstrips();
+  const std::vector<Extension::ToolstripInfo>& toolstrips =
+      extension->toolstrips();
   ASSERT_EQ(2u, scripts.size());
   EXPECT_EQ(3u, scripts[0].url_patterns().size());
   EXPECT_EQ("file://*",
@@ -551,8 +552,8 @@ TEST_F(ExtensionsServiceTest, LoadAllExtensionsFromDirectorySuccess) {
   EXPECT_EQ("http://*.google.com/*", permissions[0].GetAsString());
   EXPECT_EQ("https://*.google.com/*", permissions[1].GetAsString());
   ASSERT_EQ(2u, toolstrips.size());
-  EXPECT_EQ("toolstrip1.html", toolstrips[0]);
-  EXPECT_EQ("toolstrip2.html", toolstrips[1]);
+  EXPECT_EQ("toolstrip1.html", toolstrips[0].toolstrip.spec());
+  EXPECT_EQ("toolstrip2.html", toolstrips[1].toolstrip.spec());
 
   EXPECT_EQ(std::string(good1), loaded_[1]->id());
   EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name());