Merge 143605 - grd file update for new 2x assets

chrome/browser/protector/prefs_backup_invalid_change.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/base_prefs_change.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
 
 // Unknown change to Preferences with invalid backup.
 class PrefsBackupInvalidChange : public BasePrefsChange {
  public:
   PrefsBackupInvalidChange();
 
   // BasePrefsChange overrides:
@@ skipping 109 matching lines @@
 
 bool PrefsBackupInvalidChange::CanBeMerged() const {
   return false;
 }
 
 BaseSettingChange* CreatePrefsBackupInvalidChange() {
   return new PrefsBackupInvalidChange();
 }
 
 }  // namespace protector