Merge Chromium at r66597: Fix conflicts.

build_config.h
http://src.chromium.org/viewvc/chrome?view=rev&revision=65920

pref_value_store.cc|h
http://src.chromium.org/viewvc/chrome?view=rev&revision=66426

personal_data_manager.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=65830

x509_certificate_openssl.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=66413

Change-Id: I2eab5c3e50a2fa4d79da023049681d36ca4bc0da

3 files changed, 4 insertions, 61 deletions

diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc
index c978aae..b6a99d8 100644
--- a/chrome/browser/autofill/personal_data_manager.cc
+++ b/chrome/browser/autofill/personal_data_manager.cc
@@ -168,17 +168,12 @@ void PersonalDataManager::RemoveObserver(
 }
 
 bool PersonalDataManager::ImportFormData(
-<<<<<<< HEAD
-    const std::vector<FormStructure*>& form_structures,
-    AutoFillManager* autofill_manager) {
+    const std::vector<FormStructure*>& form_structures) {
 #ifdef ANDROID
   // TODO: Is this the funcionality that tries to create a profile for the user
   // based on what they've entered into forms?
   return false;
 #else
-=======
-    const std::vector<FormStructure*>& form_structures) {
->>>>>>> chromium.org at r66597
   // Parse the form and construct a profile based on the information that is
   // possible to import.
   int importable_fields = 0;
diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc
index 53690c4..eddf43a 100644
--- a/chrome/browser/prefs/pref_value_store.cc
+++ b/chrome/browser/prefs/pref_value_store.cc
@@ -43,7 +43,7 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(
     Profile* profile,
     bool user_only) {
 #ifdef ANDROID
-  return new PrefValueStore(NULL, NULL, NULL, NULL, NULL, new DefaultPrefStore());
+  return new PrefValueStore(NULL, NULL, NULL, NULL, NULL, NULL, new DefaultPrefStore());
 #else
   using policy::ConfigurationPolicyPrefStore;
   ConfigurationPolicyPrefStore* managed = NULL;
@@ -67,14 +67,10 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(
     recommended =
         ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore();
   }
-<<<<<<< HEAD
-  return new PrefValueStore(managed, extension, command_line, user,
-                            recommended, default_store);
-#endif
-=======
+
   return new PrefValueStore(managed, device_management, extension,
                             command_line, user, recommended, default_store);
->>>>>>> chromium.org at r66597
+#endif
 }
 
 PrefValueStore::~PrefValueStore() {}
@@ -308,46 +304,7 @@ bool PrefValueStore::GetValueFromStore(
   return false;
 }
 
-<<<<<<< HEAD
 #ifndef ANDROID
-void PrefValueStore::RefreshPolicyPrefsCompletion(
-    PrefStore* new_managed_pref_store,
-    PrefStore* new_recommended_pref_store,
-    AfterRefreshCallback* callback_pointer) {
-  scoped_ptr<AfterRefreshCallback> callback(callback_pointer);
-  DictionaryValue* managed_prefs_before(
-      pref_stores_[PrefNotifier::MANAGED_STORE]->prefs());
-  DictionaryValue* managed_prefs_after(new_managed_pref_store->prefs());
-  DictionaryValue* recommended_prefs_before(
-      pref_stores_[PrefNotifier::RECOMMENDED_STORE]->prefs());
-  DictionaryValue* recommended_prefs_after(new_recommended_pref_store->prefs());
-
-  std::vector<std::string> changed_managed_paths;
-  managed_prefs_before->GetDifferingPaths(managed_prefs_after,
-                                          &changed_managed_paths);
-
-  std::vector<std::string> changed_recommended_paths;
-  recommended_prefs_before->GetDifferingPaths(recommended_prefs_after,
-                                              &changed_recommended_paths);
-
-  std::vector<std::string> changed_paths(changed_managed_paths.size() +
-                                         changed_recommended_paths.size());
-  std::vector<std::string>::iterator last_insert =
-      std::merge(changed_managed_paths.begin(),
-                 changed_managed_paths.end(),
-                 changed_recommended_paths.begin(),
-                 changed_recommended_paths.end(),
-                 changed_paths.begin());
-  changed_paths.resize(last_insert - changed_paths.begin());
-
-  pref_stores_[PrefNotifier::MANAGED_STORE].reset(new_managed_pref_store);
-  pref_stores_[PrefNotifier::RECOMMENDED_STORE].reset(
-      new_recommended_pref_store);
-  callback->Run(changed_paths);
-}
-
-=======
->>>>>>> chromium.org at r66597
 void PrefValueStore::RefreshPolicyPrefsOnFileThread(
     BrowserThread::ID calling_thread_id,
     PrefStore* new_managed_platform_pref_store,
diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h
index 8ab6842..d68cdd9 100644
--- a/chrome/browser/prefs/pref_value_store.h
+++ b/chrome/browser/prefs/pref_value_store.h
@@ -164,22 +164,13 @@ class PrefValueStore : public base::RefCountedThreadSafe<PrefValueStore> {
   // lifecycle is managed in another thread.
   typedef Callback1<std::vector<std::string> >::Type AfterRefreshCallback;
 
-<<<<<<< HEAD
 #ifndef ANDROID
-  // Called as a result of a notification of policy change. Triggers a
-  // reload of managed preferences from policy from a Task on the FILE
-  // thread. The Task will take ownership of the |callback|. |callback| is
-  // called with the set of preferences changed by the policy refresh.
-  // |callback| is called on the caller's thread as a Task after
-  // RefreshPolicyPrefs has returned.
-=======
   // Called as a result of a notification of policy change. Triggers a reload of
   // managed platform, device management and recommended preferences from policy
   // from a Task on the FILE thread. The Task will take ownership of the
   // |callback|. |callback| is called with the set of preferences changed by the
   // policy refresh. |callback| is called on the caller's thread as a Task
   // after RefreshPolicyPrefs has returned.
->>>>>>> chromium.org at r66597
   void RefreshPolicyPrefs(AfterRefreshCallback* callback);
 #endif