Move scoped_vector.h and stl_util-inl.h to base/

app/resource_bundle.h

 // Copyright (c) 2006-2009 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_RESOURCE_BUNDLE_H__
-#define CHROME_COMMON_RESOURCE_BUNDLE_H__
+#ifndef APP_RESOURCE_BUNDLE_H_
+#define APP_RESOURCE_BUNDLE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/extensions/extension.h"
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 namespace base {
-  class DataPack;
+class DataPack;
 };
 #endif
 #if defined(OS_LINUX)
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 class ChromeFont;
 class Extension;
 class SkBitmap;
 class StringPiece;
 
@@ skipping 157 matching lines @@
   scoped_ptr<ChromeFont> large_font_;
   scoped_ptr<ChromeFont> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   scoped_ptr<Extension> theme_extension_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
 };
 
-#endif // CHROME_COMMON_RESOURCE_BUNDLE_H__
+#endif // APP_RESOURCE_BUNDLE_H_