add mole info to toolstrip definition and enable moles

chrome/browser/extensions/extensions_service_unittest.cc

 // Copyright (c) 2006-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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 503 matching lines @@
   ValidatePrefKeyCount(3);
   ValidatePref(good0, L"state", Extension::ENABLED);
   ValidatePref(good0, L"location", Extension::INTERNAL);
   ValidatePref(good1, L"state", Extension::ENABLED);
   ValidatePref(good1, L"location", Extension::INTERNAL);
   ValidatePref(good2, L"state", Extension::ENABLED);
   ValidatePref(good2, L"location", Extension::INTERNAL);
 
   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://*",
             scripts[0].url_patterns()[0].GetAsString());
   EXPECT_EQ("http://*.google.com/*",
             scripts[0].url_patterns()[1].GetAsString());
   EXPECT_EQ("https://*.google.com/*",
             scripts[0].url_patterns()[2].GetAsString());
   EXPECT_EQ(2u, scripts[0].js_scripts().size());
   EXPECT_EQ(
       NormalizeSeperators(extension->path().AppendASCII("script1.js").value()),
       NormalizeSeperators(scripts[0].js_scripts()[0].path().value()));
   EXPECT_EQ(
       NormalizeSeperators(extension->path().AppendASCII("script2.js").value()),
       NormalizeSeperators(scripts[0].js_scripts()[1].path().value()));
   EXPECT_TRUE(extension->plugins().empty());
   EXPECT_EQ(1u, scripts[1].url_patterns().size());
   EXPECT_EQ("http://*.news.com/*", scripts[1].url_patterns()[0].GetAsString());
   EXPECT_EQ(
       NormalizeSeperators(extension->path()
                           .AppendASCII("js_files")
                           .AppendASCII("script3.js")
                           .value()),
       NormalizeSeperators(scripts[1].js_scripts()[0].path().value()));
   const std::vector<URLPattern> permissions = extension->permissions();
   ASSERT_EQ(2u, permissions.size());
   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());
   EXPECT_EQ(std::string(""), loaded_[1]->description());
   // TODO(erikkay): re-enable:
   // http://code.google.com/p/chromium/issues/detail?id=15363.
   // EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"),
   //          loaded_[1]->background_url());
   EXPECT_EQ(0u, loaded_[1]->content_scripts().size());
   EXPECT_EQ(2u, loaded_[1]->plugins().size());
@@ skipping 895 matching lines @@
 
   recorder.set_ready(false);
   command_line.reset(new CommandLine(L""));
   service = new ExtensionsService(&profile, command_line.get(),
       profile.GetPrefs(), install_dir, &loop, &loop, false);
   EXPECT_TRUE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
   EXPECT_TRUE(recorder.ready());
 }