Rename ExtensionsService to ExtensionService.

chrome/browser/extensions/extension_toolbar_model_browsertest.cc

 // Copyright (c) 2010 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/extensions_service.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/in_process_browser_test.h"
 
 // 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 ExtensionsService could run
+// 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;
     moved_count_ = 0;
 
     ExtensionBrowserTest::SetUp();
   }
 
   virtual Browser* CreateBrowser(Profile* profile) {
     Browser* b = InProcessBrowserTest::CreateBrowser(profile);
-    ExtensionsService* service = b->profile()->GetExtensionsService();
+    ExtensionService* service = b->profile()->GetExtensionService();
     model_ = service->toolbar_model();
     model_->AddObserver(this);
     return b;
   }
 
   virtual void CleanUpOnMainThread() {
     model_->RemoveObserver(this);
   }
 
   virtual void BrowserActionAdded(const Extension* extension, int index) {
@@ skipping 180 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());
 }