Merge 232631 "This CL broke the official builders."

chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h

 // Copyright (c) 2013 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_COMMON_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_HANDLER_H_
 #define CHROME_COMMON_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_HANDLER_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 
 struct ManagedModeInfo : public Extension::ManifestData {
   ManagedModeInfo();
   virtual ~ManagedModeInfo();
 
   static bool IsContentPack(const Extension* extension);
   static ExtensionResource GetContentPackSiteList(const Extension* extension);
 
@@ skipping 17 matching lines @@
   bool LoadConfigurations(ManagedModeInfo* info,
                           const base::DictionaryValue* content_pack_value,
                           string16* error);
 
   DISALLOW_COPY_AND_ASSIGN(ManagedModeHandler);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_HANDLER_H_