chrome/browser/extensions/settings/settings_sync_unittest.cc - Issue 9114020: Remove task.h and finish base::Bind() migration.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9114020: Remove task.h and finish base::Bind() migration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix typo Created 8 years, 11 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

« no previous file with comments | « chrome/browser/extensions/settings/settings_storage_unittest.h ('k') | chrome/browser/favicon/favicon_service.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "base/task.h"

14 #include "chrome/browser/extensions/settings/failing_settings_storage.h"	13 #include "chrome/browser/extensions/settings/failing_settings_storage.h"

15 #include "chrome/browser/extensions/settings/settings_frontend.h"	14 #include "chrome/browser/extensions/settings/settings_frontend.h"

16 #include "chrome/browser/extensions/settings/settings_storage_cache.h"	15 #include "chrome/browser/extensions/settings/settings_storage_cache.h"

17 #include "chrome/browser/extensions/settings/settings_storage_factory.h"	16 #include "chrome/browser/extensions/settings/settings_storage_factory.h"

18 #include "chrome/browser/extensions/settings/settings_sync_util.h"	17 #include "chrome/browser/extensions/settings/settings_sync_util.h"

19 #include "chrome/browser/extensions/settings/settings_test_util.h"	18 #include "chrome/browser/extensions/settings/settings_test_util.h"

20 #include "chrome/browser/extensions/settings/syncable_settings_storage.h"	19 #include "chrome/browser/extensions/settings/syncable_settings_storage.h"

21 #include "chrome/browser/extensions/settings/testing_settings_storage.h"	20 #include "chrome/browser/extensions/settings/testing_settings_storage.h"

22 #include "chrome/browser/sync/api/sync_change_processor.h"	21 #include "chrome/browser/sync/api/sync_change_processor.h"

23 #include "content/test/test_browser_thread.h"	22 #include "content/test/test_browser_thread.h"

(...skipping 1261 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1285 DictionaryValue expected;	1284 DictionaryValue expected;

1286 expected.Set("large_value", large_value.DeepCopy());	1285 expected.Set("large_value", large_value.DeepCopy());

1287 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage1->Get());	1286 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage1->Get());

1288 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage2->Get());	1287 EXPECT_PRED_FORMAT2(SettingsEq, expected, storage2->Get());

1289 }	1288 }

1290	1289

1291 GetSyncableService(model_type)->StopSyncing(model_type);	1290 GetSyncableService(model_type)->StopSyncing(model_type);

1292 }	1291 }

1293	1292

1294 } // namespace extensions	1293 } // namespace extensions

OLD	NEW