Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Side by Side Diff: chrome/browser/extensions/settings/settings_sync_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/scoped_temp_dir.h" 12 #include "base/scoped_temp_dir.h"
13 #include "chrome/browser/value_store/failing_value_store.h" 13 #include "chrome/browser/value_store/failing_value_store.h"
14 #include "chrome/browser/extensions/settings/leveldb_settings_storage_factory.h" 14 #include "chrome/browser/extensions/settings/leveldb_settings_storage_factory.h"
15 #include "chrome/browser/extensions/settings/settings_frontend.h" 15 #include "chrome/browser/extensions/settings/settings_frontend.h"
16 #include "chrome/browser/extensions/settings/settings_storage_factory.h" 16 #include "chrome/browser/extensions/settings/settings_storage_factory.h"
17 #include "chrome/browser/extensions/settings/settings_sync_util.h" 17 #include "chrome/browser/extensions/settings/settings_sync_util.h"
18 #include "chrome/browser/extensions/settings/settings_test_util.h" 18 #include "chrome/browser/extensions/settings/settings_test_util.h"
19 #include "chrome/browser/extensions/settings/syncable_settings_storage.h" 19 #include "chrome/browser/extensions/settings/syncable_settings_storage.h"
20 #include "chrome/browser/value_store/testing_value_store.h" 20 #include "chrome/browser/value_store/testing_value_store.h"
21 #include "content/test/test_browser_thread.h" 21 #include "content/public/test/test_browser_thread.h"
22 #include "sync/api/sync_change_processor.h" 22 #include "sync/api/sync_change_processor.h"
23 #include "sync/api/sync_error_factory.h" 23 #include "sync/api/sync_error_factory.h"
24 #include "sync/api/sync_error_factory_mock.h" 24 #include "sync/api/sync_error_factory_mock.h"
25 25
26 using content::BrowserThread; 26 using content::BrowserThread;
27 27
28 namespace extensions { 28 namespace extensions {
29 29
30 namespace util = settings_test_util; 30 namespace util = settings_test_util;
31 31
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1375 DictionaryValue expected; 1375 DictionaryValue expected;
1376 expected.Set("large_value", large_value.DeepCopy()); 1376 expected.Set("large_value", large_value.DeepCopy());
1377 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage1->Get()); 1377 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage1->Get());
1378 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage2->Get()); 1378 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage2->Get());
1379 } 1379 }
1380 1380
1381 GetSyncableService(model_type)->StopSyncing(model_type); 1381 GetSyncableService(model_type)->StopSyncing(model_type);
1382 } 1382 }
1383 1383
1384 } // namespace extensions 1384 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698