Move content settings extension API to content_settings dir.

chrome/browser/extensions/api/content_settings/content_settings_api.h

 // Copyright (c) 2012 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.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_H__
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_H__
+#ifndef CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_H__
+#define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_H__
 #pragma once
 
 #include "chrome/browser/extensions/extension_function.h"
 
 namespace webkit {
 namespace npapi {
 class PluginGroup;
 }
 }
 
 class ClearContentSettingsFunction : public SyncExtensionFunction {

[Aaron Boodman, 2012/05/11 21:18:26]

If you do more of these, can you put them in the 'extensions' namespace at the
same time?

Not a big deal, but that's another little cleanup that would be nice.

[chebert, 2012/05/12 01:24:42]

Done.

  public:
   DECLARE_EXTENSION_FUNCTION_NAME("contentSettings.clear")
 
  protected:
   virtual ~ClearContentSettingsFunction() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
@@ skipping 33 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest,
                            ContentSettingsGetResourceIdentifiers);
 
   void OnGotPluginGroups(const std::vector<webkit::npapi::PluginGroup>& groups);
 
   // Used to override the global plugin list in tests.
   static void SetPluginGroupsForTesting(
       const std::vector<webkit::npapi::PluginGroup>* plugin_groups);
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_H__
+#endif  // CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_H__