Separate the syncing of extension settings and app settings into separate data

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 227 matching lines @@
 
 ExtensionService::NaClModuleInfo::NaClModuleInfo() {
 }
 
 ExtensionService::NaClModuleInfo::~NaClModuleInfo() {
 }
 
 // ExtensionService.
 
 const char* ExtensionService::kInstallDirectoryName = "Extensions";
-const char* ExtensionService::kSettingsDirectoryName = "Extension Settings";
+const char* ExtensionService::kExtensionSettingsDirectoryName =
+    "Extension Settings";
+const char* ExtensionService::kAppSettingsDirectoryName = "App Settings";
 
 // Implements IO for the ExtensionService.
 
 class ExtensionServiceBackend
     : public base::RefCountedThreadSafe<ExtensionServiceBackend> {
  public:
   // |install_directory| is a path where to look for extensions to load.
   ExtensionServiceBackend(
       base::WeakPtr<ExtensionService> frontend,
       const FilePath& install_directory);
@@ skipping 2766 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }