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

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

Issue 16189015: [OBSOLETE] Slogging webkit_base out of existence. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
« no previous file with comments | « no previous file | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #include "net/url_request/url_request_context.h" 97 #include "net/url_request/url_request_context.h"
98 #include "net/url_request/url_request_context_getter.h" 98 #include "net/url_request/url_request_context_getter.h"
99 #include "sync/api/string_ordinal.h" 99 #include "sync/api/string_ordinal.h"
100 #include "sync/api/sync_error_factory.h" 100 #include "sync/api/sync_error_factory.h"
101 #include "sync/api/sync_error_factory_mock.h" 101 #include "sync/api/sync_error_factory_mock.h"
102 #include "sync/protocol/app_specifics.pb.h" 102 #include "sync/protocol/app_specifics.pb.h"
103 #include "sync/protocol/extension_specifics.pb.h" 103 #include "sync/protocol/extension_specifics.pb.h"
104 #include "sync/protocol/sync.pb.h" 104 #include "sync/protocol/sync.pb.h"
105 #include "testing/gtest/include/gtest/gtest.h" 105 #include "testing/gtest/include/gtest/gtest.h"
106 #include "testing/platform_test.h" 106 #include "testing/platform_test.h"
107 #include "webkit/base/origin_url_conversions.h" 107 #include "webkit/common/base/origin_url_conversions.h"
108 #include "webkit/browser/database/database_tracker.h" 108 #include "webkit/browser/database/database_tracker.h"
109 #include "webkit/browser/quota/quota_manager.h" 109 #include "webkit/browser/quota/quota_manager.h"
110 #include "webkit/plugins/npapi/mock_plugin_list.h" 110 #include "webkit/plugins/npapi/mock_plugin_list.h"
111 111
112 #if defined(OS_CHROMEOS) 112 #if defined(OS_CHROMEOS)
113 #include "chrome/browser/chromeos/extensions/install_limiter.h" 113 #include "chrome/browser/chromeos/extensions/install_limiter.h"
114 #include "chrome/browser/chromeos/login/user_manager.h" 114 #include "chrome/browser/chromeos/login/user_manager.h"
115 #include "chrome/browser/chromeos/settings/cros_settings.h" 115 #include "chrome/browser/chromeos/settings/cros_settings.h"
116 #include "chrome/browser/chromeos/settings/device_settings_service.h" 116 #include "chrome/browser/chromeos/settings/device_settings_service.h"
117 #endif 117 #endif
(...skipping 5902 matching lines...) Expand 10 before | Expand all | Expand 10 after
6020 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF); 6020 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF);
6021 AddMockExternalProvider(provider); 6021 AddMockExternalProvider(provider);
6022 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path); 6022 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path);
6023 6023
6024 service_->CheckForExternalUpdates(); 6024 service_->CheckForExternalUpdates();
6025 loop_.RunUntilIdle(); 6025 loop_.RunUntilIdle();
6026 EXPECT_TRUE(extensions::HasExternalInstallError(service_)); 6026 EXPECT_TRUE(extensions::HasExternalInstallError(service_));
6027 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_)); 6027 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_));
6028 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore)); 6028 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore));
6029 } 6029 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698