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

Side by Side Diff: chrome/browser/sync/test/integration/extension_settings_helper.cc

Issue 11778097: Revert revision 176015 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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
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 "chrome/browser/sync/test/integration/extension_settings_helper.h" 5 #include "chrome/browser/sync/test/integration/extension_settings_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/memory/scoped_ptr.h"
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/synchronization/waitable_event.h" 11 #include "base/synchronization/waitable_event.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
14 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/extensions/settings/settings_frontend.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/sync/test/integration/extensions_helper.h" 16 #include "chrome/browser/sync/test/integration/extensions_helper.h"
17 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 17 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
18 #include "chrome/browser/sync/test/integration/sync_extension_helper.h" 18 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
19 #include "chrome/browser/value_store/value_store.h" 19 #include "chrome/browser/value_store/value_store.h"
20 #include "chrome/common/extensions/extension.h" 20 #include "chrome/common/extensions/extension.h"
21 #include "chrome/common/extensions/extension_set.h" 21 #include "chrome/common/extensions/extension_set.h"
22 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
23 23
24 using content::BrowserThread; 24 using content::BrowserThread;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 bool all_profiles_same = true; 113 bool all_profiles_same = true;
114 for (int i = 0; i < test()->num_clients(); ++i) { 114 for (int i = 0; i < test()->num_clients(); ++i) {
115 // &= so that all profiles are tested; analogous to EXPECT over ASSERT. 115 // &= so that all profiles are tested; analogous to EXPECT over ASSERT.
116 all_profiles_same &= 116 all_profiles_same &=
117 AreSettingsSame(test()->verifier(), test()->GetProfile(i)); 117 AreSettingsSame(test()->verifier(), test()->GetProfile(i));
118 } 118 }
119 return all_profiles_same; 119 return all_profiles_same;
120 } 120 }
121 121
122 } // namespace extension_settings_helper 122 } // namespace extension_settings_helper
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698