Merge Chromium at r11.0.672.0: Fix conflicts in pref_value_store.cc

Upstream change close to local commit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_value_store.cc?view=diff&pathrev=74924&r1=72786&r2=72787

Change-Id: Ic2f680446e0bc5ff84edc91bc22c2b287638c81d

1 files changed, 1 insertions, 23 deletions

diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc
index d3cf044..7ebd532 100644
--- a/chrome/browser/prefs/pref_value_store.cc
+++ b/chrome/browser/prefs/pref_value_store.cc
@@ -126,34 +126,12 @@ void PrefValueStore::NotifyPrefChanged(
     const char* path,
     PrefValueStore::PrefStoreType new_store) {
   DCHECK(new_store != INVALID_STORE);
-
-<<<<<<< HEAD
-  // If this pref is not registered, just discard the notification.
-  if (!pref_types_.count(path))
-    return;
-
-  bool changed = true;
-  // Replying that the pref has changed in case the new store is invalid may
-  // cause problems, but it's the safer choice.
-  if (new_store != INVALID_STORE) {
-    PrefStoreType controller = ControllingPrefStoreForPref(path);
-    DCHECK(controller != INVALID_STORE);
-    // If the pref is controlled by a higher-priority store, its effective value
-    // cannot have changed.
-    if (controller != INVALID_STORE &&
-        controller < new_store) {
-      changed = false;
-    }
-  }
-
 #ifndef ANDROID
-  if (changed)
-=======
+
   // If the pref is controlled by a higher-priority store, its effective value
   // cannot have changed.
   PrefStoreType controller = ControllingPrefStoreForPref(path);
   if (controller == INVALID_STORE || controller >= new_store)
->>>>>>> chromium.org at r11.0.672.0
     pref_notifier_->OnPreferenceChanged(path);
 #endif
 }