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

http://crbug.com/11387

Review URL: http://codereview.chromium.org/107001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15272 0039d316-1c4b-4281-b951-d872f2087c98

app/resource_bundle.h

@@ -2,8 +2,8 @@
 // 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"
 
@@ -22,7 +22,7 @@
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 namespace base {
-  class DataPack;
+class DataPack;
 };
 #endif
 #if defined(OS_LINUX)
@@ -200,4 +200,4 @@ class ResourceBundle {
   DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
 };
 
-#endif // CHROME_COMMON_RESOURCE_BUNDLE_H__
+#endif // APP_RESOURCE_BUNDLE_H_

base/base.gyp

@@ -231,6 +231,7 @@
         'scoped_temp_dir.h',
         'scoped_variant_win.cc',
         'scoped_variant_win.h',
+        'scoped_vector.h',
         'sha2.cc',
         'sha2.h',
         'shared_memory.h',
@@ -244,6 +245,7 @@
         'stats_counters.h',
         'stats_table.cc',
         'stats_table.h',
+        'stl_util-inl.h',
         'string16.cc',
         'string16.h',
         'string_escape.cc',

base/scoped_vector.h

@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_COMMON_SCOPED_VECTOR_H__
-#define CHROME_BROWSER_COMMON_SCOPED_VECTOR_H__
+#ifndef BASE_SCOPED_VECTOR_H_
+#define BASE_SCOPED_VECTOR_H_
 
 #include <vector>
 
-#include "chrome/common/stl_util-inl.h"
+#include "base/logging.h"
+#include "base/stl_util-inl.h"
 
 // ScopedVector wraps a vector deleting the elements from its
 // destructor.
@@ -45,7 +46,7 @@ class ScopedVector {
  private:
   std::vector<T*> v;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ScopedVector);
+  DISALLOW_COPY_AND_ASSIGN(ScopedVector);
 };
 
-#endif // CHROME_BROWSER_COMMON_SCOPED_VECTOR_H__
+#endif // BASE_SCOPED_VECTOR_H_

base/stl_util-inl.h

@@ -1,14 +1,12 @@
-//
 // Copyright (c) 2006-2008 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.
-//
+
 // STL utility functions.  Usually, these replace built-in, but slow(!),
 // STL functions with more efficient versions.
-//
 
-#ifndef CHROME_COMMON_STL_UTIL_INL_H__
-#define CHROME_COMMON_STL_UTIL_INL_H__
+#ifndef BASE_STL_UTIL_INL_H_
+#define BASE_STL_UTIL_INL_H_
 
 #include <string.h>  // for memcpy
 #include <functional>
@@ -449,4 +447,4 @@ std::vector<T> SetToVector(const std::set<T>& values) {
   return result;
 }
 
-#endif  // CHROME_COMMON_STL_UTIL_INL_H__
+#endif  // BASE_STL_UTIL_INL_H_

chrome/browser/bookmarks/bookmark_model.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 #include "base/gfx/png_decoder.h"
+#include "base/scoped_vector.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
@@ -12,7 +13,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/scoped_vector.h"
 #include "grit/generated_resources.h"
 
 using base::Time;

chrome/browser/cert_store.cc

@@ -7,11 +7,11 @@
 #include <algorithm>
 #include <functional>
 
+#include "base/stl_util-inl.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/stl_util-inl.h"
 
 template <typename T>
 struct MatchSecond {

chrome/browser/command_updater.cc

@@ -7,7 +7,7 @@
 #include "chrome/browser/command_updater.h"
 
 #include "base/logging.h"
-#include "chrome/common/stl_util-inl.h"
+#include "base/stl_util-inl.h"
 
 CommandUpdater::CommandUpdater(CommandUpdaterDelegate* handler)
     : delegate_(handler) {

chrome/browser/dom_ui/dom_ui.cc

@@ -6,11 +6,11 @@
 
 #include "base/json_reader.h"
 #include "base/json_writer.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/stl_util-inl.h"
 
 DOMUI::DOMUI(TabContents* contents)
     : hide_favicon_(false),

chrome/browser/download/download_file.cc

@@ -6,6 +6,7 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "build/build_config.h"
@@ -17,7 +18,6 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/platform_util.h"
-#include "chrome/common/stl_util-inl.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_util.h"

chrome/browser/download/download_manager.cc

@@ -10,6 +10,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
@@ -33,7 +34,6 @@
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"

chrome/browser/download/save_file_manager.cc

@@ -8,6 +8,7 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"
@@ -18,7 +19,6 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/platform_util.h"
-#include "chrome/common/stl_util-inl.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/base/io_buffer.h"

chrome/browser/download/save_package.cc

@@ -8,6 +8,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/thread.h"
@@ -29,7 +30,6 @@
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "net/base/io_buffer.h"

chrome/browser/extensions/extension_message_service.cc

@@ -6,6 +6,7 @@
 
 #include "base/json_writer.h"
 #include "base/singleton.h"
+#include "base/stl_util-inl.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extension.h"
@@ -18,7 +19,6 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/stl_util-inl.h"
 
 // Since we have 2 ports for every channel, we just index channels by half the
 // port ID.
@@ -215,7 +215,7 @@ void ExtensionMessageService::Observe(NotificationType type,
 
   DCHECK(type.value == NotificationType::RENDERER_PROCESS_TERMINATED ||
          type.value == NotificationType::RENDERER_PROCESS_CLOSED);
-  
+
   RenderProcessHost* renderer = Source<RenderProcessHost>(source).ptr();
 
   {

chrome/browser/extensions/user_script_master.cc

@@ -10,9 +10,9 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
 

chrome/browser/history/history_backend.h

@@ -11,6 +11,7 @@
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
+#include "base/scoped_vector.h"
 #include "base/task.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/download_types.h"
@@ -23,7 +24,6 @@
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/browser/history/visit_tracker.h"
 #include "chrome/common/mru_cache.h"
-#include "chrome/common/scoped_vector.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class BookmarkService;

chrome/browser/history/history_marshaling.h

@@ -8,10 +8,10 @@
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H__
 #define CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H__
 
+#include "base/scoped_vector.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/page_usage_data.h"
-#include "chrome/common/scoped_vector.h"
 
 namespace history {
 

chrome/browser/history/history_types.h

@@ -13,10 +13,10 @@
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/stack_container.h"
+#include "base/stl_util-inl.h"
 #include "base/time.h"
 #include "chrome/browser/history/snippet.h"
 #include "chrome/common/page_transition_types.h"
-#include "chrome/common/stl_util-inl.h"
 #include "googleurl/src/gurl.h"
 
 namespace history {

chrome/browser/history/history_unittest.cc

@@ -26,6 +26,7 @@
 #include "base/gfx/jpeg_codec.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"
@@ -39,7 +40,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/sqlite_utils.h"
-#include "chrome/common/scoped_vector.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/history/query_parser.cc

@@ -7,10 +7,10 @@
 #include "chrome/browser/history/query_parser.h"
 
 #include "base/logging.h"
+#include "base/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/word_iterator.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/scoped_vector.h"
 #include "unicode/uscript.h"
 
 namespace {

chrome/browser/history/query_parser_unittest.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/history/query_parser.h"
 #include "base/basictypes.h"
-#include "chrome/common/scoped_vector.h"
+#include "base/scoped_vector.h"
+#include "chrome/browser/history/query_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class QueryParserTest : public testing::Test {

chrome/browser/history/starred_url_database.cc

@@ -7,6 +7,8 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/json_writer.h"
+#include "base/scoped_vector.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
@@ -14,10 +16,8 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/meta_table_helper.h"
-#include "chrome/common/scoped_vector.h"
 #include "chrome/common/sqlite_compiled_statement.h"
 #include "chrome/common/sqlite_utils.h"
-#include "chrome/common/stl_util-inl.h"
 
 using base::Time;
 

chrome/browser/icon_manager.cc

@@ -6,7 +6,7 @@
 
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/stl_util-inl.h"
+#include "base/stl_util-inl.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 

chrome/browser/navigation_controller_unittest.cc

@@ -4,6 +4,7 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/history/history.h"
@@ -18,7 +19,6 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/test/test_notification_tracker.h"
 #include "chrome/test/testing_profile.h"
 #include "net/base/net_util.h"

chrome/browser/password_manager/password_form_manager.h

@@ -6,7 +6,8 @@
 #define CHROME_BROWSER_PASSWORD_FORM_MANAGER_H__
 
 #include "build/build_config.h"
-#include "chrome/common/stl_util-inl.h"
+
+#include "base/stl_util-inl.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "webkit/glue/password_form.h"
 

chrome/browser/password_manager/password_manager.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/password_manager/password_manager.h"
 
 #include "app/resource_bundle.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -13,7 +14,6 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"

chrome/browser/password_manager/password_manager.h

@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_PASSWORD_MANAGER_H__
 
 #include "base/scoped_ptr.h"
+#include "base/stl_util-inl.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/common/stl_util-inl.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/password_form_dom_manager.h"
 

chrome/browser/printing/page_range.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/printing/page_range.h"
 
-#include "chrome/common/stl_util-inl.h"
+#include "base/stl_util-inl.h"
 
 namespace printing {
 

chrome/browser/renderer_host/resource_dispatcher_host.cc

@@ -10,6 +10,7 @@
 
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
+#include "base/stl_util-inl.h"
 #include "base/time.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/cross_site_request_manager.h"
@@ -35,7 +36,6 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/stl_util-inl.h"
 #include "net/base/auth.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/load_flags.h"

chrome/browser/safe_browsing/protocol_manager.cc

@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/task.h"
@@ -17,7 +18,6 @@
 #include "chrome/browser/safe_browsing/protocol_parser.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/env_vars.h"
-#include "chrome/common/stl_util-inl.h"
 #include "net/base/base64.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"

chrome/browser/search_engines/template_url_fetcher.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_TEMPLATE_URL_FETCHER_H_
 
 #include "base/gfx/native_widget_types.h"
-#include "chrome/common/scoped_vector.h"
+#include "base/scoped_vector.h"
 
 class GURL;
 class Profile;

chrome/browser/search_engines/template_url_model.cc

@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_url_tracker.h"
@@ -20,7 +21,6 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"

chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/scoped_vector.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/scoped_vector.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/sessions/base_session_service.cc

@@ -5,13 +5,13 @@
 #include "chrome/browser/sessions/base_session_service.h"
 
 #include "base/pickle.h"
+#include "base/stl_util-inl.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/common/stl_util-inl.h"
 #include "webkit/glue/webkit_glue.h"
 
 // InternalGetCommandsRequest -------------------------------------------------

chrome/browser/sessions/session_backend.cc

@@ -8,7 +8,7 @@
 
 #include "base/file_util.h"
 #include "base/histogram.h"
-#include "chrome/common/scoped_vector.h"
+#include "base/scoped_vector.h"
 
 using base::TimeTicks;
 

chrome/browser/sessions/session_backend_unittest.cc

@@ -4,11 +4,11 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "base/time.h"
 #include "chrome/browser/sessions/session_backend.h"
-#include "chrome/common/stl_util-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

chrome/browser/sessions/session_service.cc

@@ -11,6 +11,7 @@
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
+#include "base/scoped_vector.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_init.h"
 #include "chrome/browser/browser_list.h"
@@ -26,7 +27,6 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/scoped_vector.h"
 
 using base::Time;
 

chrome/browser/sessions/session_service_test_helper.cc

@@ -4,11 +4,11 @@
 
 #include "chrome/browser/sessions/session_service_test_helper.h"
 
+#include "base/scoped_vector.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/common/scoped_vector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;

chrome/browser/sessions/session_service_unittest.cc

@@ -4,6 +4,8 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/scoped_vector.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/sessions/session_backend.h"
@@ -12,8 +14,6 @@
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/scoped_vector.h"
-#include "chrome/common/stl_util-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SessionServiceTest : public testing::Test {

chrome/browser/sessions/session_types.h

@@ -9,11 +9,11 @@
 #include <vector>
 
 #include "base/gfx/rect.h"
+#include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/page_transition_types.h"
-#include "chrome/common/stl_util-inl.h"
 #include "googleurl/src/gurl.h"
 
 class NavigationEntry;

chrome/browser/sessions/tab_restore_service.cc

@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/sessions/tab_restore_service.h"
+
 #include <algorithm>
 #include <iterator>
 
-#include "chrome/browser/sessions/tab_restore_service.h"
-
+#include "base/scoped_vector.h"
+#include "base/stl_util-inl.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_command.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/common/scoped_vector.h"
-#include "chrome/common/stl_util-inl.h"
 
 using base::Time;
 

chrome/browser/tabs/tab_strip_model.cc

@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
@@ -14,7 +15,6 @@
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/url_constants.h"
 
 namespace {

chrome/browser/tabs/tab_strip_model_unittest.cc

@@ -4,6 +4,7 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/stl_util-inl.h"
 #include "chrome/browser/dock_info.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/profile.h"
@@ -15,7 +16,6 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/task_manager_resource_providers.cc

@@ -9,6 +9,7 @@
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
@@ -20,7 +21,6 @@
 #include "chrome/common/child_process_host.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/stl_util-inl.h"
 #if defined(OS_WIN)
 #include "chrome/common/gfx/icon_util.h"
 #endif  // defined(OS_WIN)

chrome/browser/views/keyword_editor_view.cc

@@ -8,6 +8,7 @@
 
 #include "app/resource_bundle.h"
 #include "base/gfx/png_decoder.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
@@ -19,7 +20,6 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/views/background.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/controls/button/native_button.h"

chrome/browser/views/options/passwords_page_view.h

@@ -8,10 +8,10 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
+#include "base/stl_util-inl.h"
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/gfx/text_elider.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/controls/label.h"
 #include "chrome/views/controls/table/table_view.h"

chrome/browser/views/shelf_item_dialog.cc

@@ -6,6 +6,7 @@
 
 #include "app/resource_bundle.h"
 #include "base/gfx/png_decoder.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
@@ -15,7 +16,6 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/views/background.h"
 #include "chrome/views/controls/label.h"
 #include "chrome/views/controls/text_field.h"

chrome/browser/views/tabs/tab_strip.cc

@@ -6,6 +6,7 @@
 
 #include "app/resource_bundle.h"
 #include "base/gfx/size.h"
+#include "base/stl_util-inl.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -21,7 +22,6 @@
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/slide_animation.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/image_view.h"
 #include "chrome/views/painter.h"

chrome/browser/webdata/web_data_service.h

@@ -11,9 +11,9 @@
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
+#include "base/scoped_vector.h"
 #include "base/thread.h"
 #include "chrome/browser/webdata/web_database.h"
-#include "chrome/common/scoped_vector.h"
 #include "webkit/glue/autofill_form.h"
 
 #if defined(OS_WIN)

chrome/browser/webdata/web_database_unittest.cc

@@ -4,13 +4,13 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/stl_util-inl.h"
 #include "skia/include/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/autofill_form.h"

chrome/chrome.gyp

@@ -373,7 +373,6 @@
         'common/result_codes.h',
         'common/sandbox_init_wrapper.cc',
         'common/sandbox_init_wrapper.h',
-        'common/scoped_vector.h',
         'common/security_filter_peer.cc',
         'common/security_filter_peer.h',
         'common/slide_animation.cc',
@@ -382,7 +381,6 @@
         'common/sqlite_compiled_statement.h',
         'common/sqlite_utils.cc',
         'common/sqlite_utils.h',
-        'common/stl_util-inl.h',
         'common/task_queue.cc',
         'common/task_queue.h',
         'common/temp_scaffolding_stubs.cc',

chrome/common/common.vcproj

@@ -749,10 +749,6 @@
 			RelativePath=".\sandbox_init_wrapper.h"
 			>
 		</File>
-		<File
-			RelativePath=".\scoped_vector.h"
-			>
-		</File>
 		<File
 			RelativePath=".\security_filter_peer.cc"
 			>
@@ -785,10 +781,6 @@
 			RelativePath=".\sqlite_utils.h"
 			>
 		</File>
-		<File
-			RelativePath=".\stl_util-inl.h"
-			>
-		</File>
 		<File
 			RelativePath=".\task_queue.cc"
 			>

chrome/common/ipc_sync_channel_unittest.cc

@@ -11,12 +11,12 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/platform_thread.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "chrome/common/ipc_message.h"
 #include "chrome/common/ipc_sync_channel.h"
-#include "chrome/common/stl_util-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 

chrome/common/l10n_util_unittest.cc

@@ -7,13 +7,13 @@
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/stl_util-inl.h"
 #if !defined(OS_MACOSX)
 #include "chrome/test/data/resource.h"
 #endif

chrome/common/os_exchange_data.cc

@@ -11,9 +11,9 @@
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/scoped_handle.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"

chrome/common/pref_service.cc

@@ -6,12 +6,12 @@
 
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/stl_util-inl.h"
 #include "grit/generated_resources.h"
 
 namespace {

chrome/common/sqlite_compiled_statement.cc

@@ -5,7 +5,7 @@
 #include "chrome/common/sqlite_compiled_statement.h"
 
 #include "base/logging.h"
-#include "chrome/common/stl_util-inl.h"
+#include "base/stl_util-inl.h"
 
 // SqliteStatementCache -------------------------------------------------------
 

chrome/common/task_queue.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/stl_util-inl.h"
-
 #include "chrome/common/task_queue.h"
 
+#include "base/stl_util-inl.h"
+
 TaskQueue::TaskQueue() {
 }
 

chrome/common/time_format.cc

@@ -9,11 +9,11 @@
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/time_format.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/common/stl_util-inl.h"
 #include "grit/generated_resources.h"
 #include "unicode/datefmt.h"
 #include "unicode/locid.h"

chrome/renderer/dom_ui_bindings.cc

@@ -5,9 +5,9 @@
 #include "chrome/renderer/dom_ui_bindings.h"
 
 #include "base/json_writer.h"
+#include "base/stl_util-inl.h"
 #include "base/values.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/stl_util-inl.h"
 
 DOMBoundBrowserObject::~DOMBoundBrowserObject() {
   STLDeleteContainerPointers(properties_.begin(), properties_.end());

chrome/renderer/user_script_slave.h

@@ -10,9 +10,9 @@
 
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
+#include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "chrome/common/extensions/user_script.h"
-#include "chrome/common/stl_util-inl.h"
 
 class WebFrame;
 

chrome/third_party/hunspell/src/hunspell/hashmgr.hxx

@@ -5,11 +5,12 @@
 #include "htypes.hxx"
 
 #ifdef HUNSPELL_CHROME_CLIENT
-#include "chrome/common/stl_util-inl.h"
-#include "chrome/third_party/hunspell/google/bdict_reader.h"
-#include "base/string_piece.h"
 #include <string>
 #include <map>
+
+#include "base/stl_util-inl.h"
+#include "base/string_piece.h"
+#include "chrome/third_party/hunspell/google/bdict_reader.h"
 #endif
 
 enum flag { FLAG_CHAR, FLAG_LONG, FLAG_NUM, FLAG_UNI };

chrome/views/controls/menu/menu.cc

@@ -14,13 +14,13 @@
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "chrome/views/accelerator.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/l10n_util_win.h"
-#include "chrome/common/stl_util-inl.h"
+#include "chrome/views/accelerator.h"
 
 const SkBitmap* Menu::Delegate::kEmptyIcon = 0;
 
@@ -151,7 +151,7 @@ class MenuHostWindow : public CWindowImpl<MenuHostWindow, CWindow,
       // Draw the label.
       RECT rect = lpdis->rcItem;
       rect.top += kItemTopMargin;
-      // Should we add kIconWidth only when icon.width() != 0 ? 
+      // Should we add kIconWidth only when icon.width() != 0 ?
       rect.left += kItemLeftMargin + kIconWidth;
       rect.right -= kItemRightMargin;
       UINT format = DT_TOP | DT_SINGLELINE;
@@ -164,11 +164,11 @@ class MenuHostWindow : public CWindowImpl<MenuHostWindow, CWindow,
       HGDIOBJ old_font = static_cast<HFONT>(SelectObject(hDC, font.hfont()));
       int fontsize = font.FontSize();
 
-      // If an accelerator is specified (with a tab delimiting the rest
-      // of the label from the accelerator), we have to justify 
-      // the fist part on the left and the accelerator on the right. 
-      // TODO(jungshik):  This will break in RTL UI. Currently, he/ar
-      // use the window system UI font and will not hit here. 
+      // If an accelerator is specified (with a tab delimiting the rest of the
+      // label from the accelerator), we have to justify the fist part on the
+      // left and the accelerator on the right.
+      // TODO(jungshik): This will break in RTL UI. Currently, he/ar use the
+      //                 window system UI font and will not hit here.
       std::wstring label = data->label;
       std::wstring accel;
       std::wstring::size_type tab_pos = label.find(L'\t');

chrome/views/controls/tabbed_pane.cc

@@ -9,10 +9,10 @@
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "base/logging.h"
+#include "base/stl_util-inl.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util_win.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/common/throb_animation.h"
 #include "chrome/views/background.h"
 #include "chrome/views/fill_layout.h"

chrome/views/controls/tree/tree_node_model.h

@@ -10,7 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/scoped_vector.h"
+#include "base/scoped_vector.h"
+#include "base/stl_util-inl.h"
 #include "chrome/views/controls/tree/tree_model.h"
 
 namespace views {

chrome/views/controls/tree/tree_view.cc

@@ -7,12 +7,12 @@
 #include <shellapi.h>
 
 #include "app/resource_bundle.h"
+#include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/l10n_util_win.h"
-#include "chrome/common/stl_util-inl.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/theme_resources.h"

chrome/views/focus/view_storage.cc

@@ -6,8 +6,8 @@
 
 #include <algorithm>
 
+#include "base/stl_util-inl.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/stl_util-inl.h"
 
 namespace views {