summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:01:52 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:01:52 +0000
commit03b9b4e1d4772cfb48c933f3ab0f93975eeb0224 (patch)
treec284b2fb69ae488f636a96fc8caf53b8bc59b8a4 /chrome_frame
parent962115b4352af262091dd4987a729560a357d246 (diff)
downloadchromium_src-03b9b4e1d4772cfb48c933f3ab0f93975eeb0224.zip
chromium_src-03b9b4e1d4772cfb48c933f3ab0f93975eeb0224.tar.gz
chromium_src-03b9b4e1d4772cfb48c933f3ab0f93975eeb0224.tar.bz2
Move the bits of Prefs where production code has only trivially easy
to break dependencies back to Chrome. This leaves the following in chrome/ for now, which will move later: - PrefService, to move once sync dependencies and dependencies on Chrome-specific pref stores are externalized. - PrefNotifierImpl and PrefObserverMock, to move once NotificationSource dependency is broken. - PrefValueStore, to move once PrefModelAssociatior dependency is externalized. - ScopedUserPrefUpdate, to move once PrefService moves. TBR=ben@chromium.org BUG=155525 Review URL: https://chromiumcodereview.appspot.com/11243002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/reliability/page_load_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index f8accc2..72e653b 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -28,6 +28,7 @@
#include "base/file_version_info.h"
#include "base/i18n/time_formatting.h"
#include "base/path_service.h"
+#include "base/prefs/json_pref_store.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/test/test_file_util.h"
@@ -42,7 +43,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/json_pref_store.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/automation/automation_proxy.h"