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

Side by Side Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/extensions/extension_service_unittest.h" 5 #include "chrome/browser/extensions/extension_service_unittest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 #include "sync/protocol/sync.pb.h" 124 #include "sync/protocol/sync.pb.h"
125 #include "testing/gtest/include/gtest/gtest.h" 125 #include "testing/gtest/include/gtest/gtest.h"
126 #include "testing/platform_test.h" 126 #include "testing/platform_test.h"
127 #include "url/gurl.h" 127 #include "url/gurl.h"
128 #include "webkit/browser/database/database_tracker.h" 128 #include "webkit/browser/database/database_tracker.h"
129 #include "webkit/browser/quota/quota_manager.h" 129 #include "webkit/browser/quota/quota_manager.h"
130 #include "webkit/common/database/database_identifier.h" 130 #include "webkit/common/database/database_identifier.h"
131 131
132 #if defined(OS_CHROMEOS) 132 #if defined(OS_CHROMEOS)
133 #include "chrome/browser/chromeos/extensions/install_limiter.h" 133 #include "chrome/browser/chromeos/extensions/install_limiter.h"
134 #include "chrome/browser/chromeos/login/user_manager.h" 134 #include "chrome/browser/chromeos/login/users/user_manager.h"
135 #include "chrome/browser/chromeos/settings/cros_settings.h" 135 #include "chrome/browser/chromeos/settings/cros_settings.h"
136 #include "chrome/browser/chromeos/settings/device_settings_service.h" 136 #include "chrome/browser/chromeos/settings/device_settings_service.h"
137 #endif 137 #endif
138 138
139 // The blacklist tests rely on safe browsing. 139 // The blacklist tests rely on safe browsing.
140 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) 140 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
141 #define ENABLE_BLACKLIST_TESTS 141 #define ENABLE_BLACKLIST_TESTS
142 #endif 142 #endif
143 143
144 using base::DictionaryValue; 144 using base::DictionaryValue;
(...skipping 6766 matching lines...) Expand 10 before | Expand all | Expand 10 after
6911 // ReconcileKnownDisabled(). 6911 // ReconcileKnownDisabled().
6912 service_->EnableExtension(good2); 6912 service_->EnableExtension(good2);
6913 service_->ReconcileKnownDisabled(); 6913 service_->ReconcileKnownDisabled();
6914 expected_extensions.insert(good2); 6914 expected_extensions.insert(good2);
6915 expected_disabled_extensions.erase(good2); 6915 expected_disabled_extensions.erase(good2);
6916 6916
6917 EXPECT_EQ(expected_extensions, registry_->enabled_extensions().GetIDs()); 6917 EXPECT_EQ(expected_extensions, registry_->enabled_extensions().GetIDs());
6918 EXPECT_EQ(expected_disabled_extensions, 6918 EXPECT_EQ(expected_disabled_extensions,
6919 registry_->disabled_extensions().GetIDs()); 6919 registry_->disabled_extensions().GetIDs());
6920 } 6920 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.h ('k') | chrome/browser/extensions/extension_system_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698