Index: chrome/browser/sync/internal_api/syncapi_unittest.cc |
diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc |
index 9b941817fc47eedb1a73a95b9653e11bb91b8359..38e808270af00cf254662c92ca715b122689d97d 100644 |
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc |
+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc |
@@ -20,6 +20,7 @@ |
#include "base/string_number_conversions.h" |
#include "base/stringprintf.h" |
#include "base/test/thread_test_helper.h" |
+#include "base/test/values_test_util.h" |
#include "base/utf_string_conversions.h" |
#include "base/values.h" |
#include "chrome/browser/password_manager/encryptor.h" |
@@ -60,7 +61,6 @@ |
#include "chrome/browser/sync/util/cryptographer.h" |
#include "chrome/browser/sync/util/extensions_activity_monitor.h" |
#include "chrome/browser/sync/util/time.h" |
-#include "chrome/test/base/values_test_util.h" |
#include "content/test/test_browser_thread.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -90,7 +90,7 @@ using syncable::ModelTypeSet; |
using syncable::ModelType; |
using syncable::NON_UNIQUE_NAME; |
using syncable::SPECIFICS; |
-using test::ExpectDictStringValue; |
+using base::ExpectDictStringValue; |
Nicolas Zea
2012/02/28 02:18:56
move to first spot in using list.
akalin
2012/02/28 22:59:28
Done.
|
using testing::_; |
using testing::AnyNumber; |
using testing::AtLeast; |