Rename ExtensionsService to ExtensionService.

chrome/browser/sync/glue/extension_util.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/sync/glue/extension_util.h"
 
 #include <sstream>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "googleurl/src/gurl.h"
 
 namespace browser_sync {
 
 ExtensionType GetExtensionType(const Extension& extension) {
   if (extension.is_theme()) {
     return THEME;
@@ skipping 198 matching lines @@
       Version::GetVersionFromString(specifics.version()));
   if (!specifics_version.get()) {
     // If version is invalid, assume we're up-to-date.
     return false;
   }
   return extension.version()->CompareTo(*specifics_version) < 0;
 }
 
 void SetExtensionProperties(
     const sync_pb::ExtensionSpecifics& specifics,
-    ExtensionsService* extensions_service, const Extension* extension) {
+    ExtensionService* extensions_service, const Extension* extension) {
   DcheckIsExtensionSpecificsValid(specifics);
   CHECK(extensions_service);
   CHECK(extension);
   DCHECK(IsExtensionValid(*extension));
   const std::string& id = extension->id();
   GURL update_url(specifics.update_url());
   if (update_url != extension->update_url()) {
     LOG(WARNING) << "specifics for extension " << id
                  << "has a different update URL than the extension: "
                  << update_url.spec() << " vs. " << extension->update_url();
@@ skipping 35 matching lines @@
     // |specifics| has a more recent or the same version, so merge it
     // in.
     CopyNonUserProperties(specifics, merged_specifics);
     if (merge_user_properties) {
       CopyUserProperties(specifics, merged_specifics);
     }
   }
 }
 
 }  // namespace browser_sync