Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / profile_resetter / profile_resetter.cc

diff --git a/src/chrome/browser/profile_resetter/profile_resetter.cc b/src/chrome/browser/profile_resetter/profile_resetter.cc
index 616babb..6b2d0af 100644 (file)
--- a/src/chrome/browser/profile_resetter/profile_resetter.cc
+++ b/src/chrome/browser/profile_resetter/profile_resetter.cc
@@ -10,7 +10,6 @@
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/google/core/browser/google_pref_names.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/search_engines/search_engines_pref_names.h"
@@ -117,7 +117,7 @@ void ProfileResetter::Reset(
   };
 
   ResettableFlags reset_triggered_for_flags = 0;
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(flagToMethod); ++i) {
+  for (size_t i = 0; i < arraysize(flagToMethod); ++i) {
     if (resettable_flags & flagToMethod[i].flag) {
       reset_triggered_for_flags |= flagToMethod[i].flag;
       (this->*flagToMethod[i].method)();