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

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

Issue 46853004: Move ExtensionPrefs and friends to extensions/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and update app_shell Created 6 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 "base/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/threading/sequenced_worker_pool.h" 8 #include "base/threading/sequenced_worker_pool.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
11 #include "chrome/browser/extensions/extension_prefs.h"
12 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/extension_sync_service.h" 12 #include "chrome/browser/extensions/extension_sync_service.h"
14 #include "chrome/browser/extensions/updater/extension_updater.h" 13 #include "chrome/browser/extensions/updater/extension_updater.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/global_error/global_error.h" 16 #include "chrome/browser/ui/global_error/global_error.h"
18 #include "chrome/browser/ui/global_error/global_error_service.h" 17 #include "chrome/browser/ui/global_error/global_error_service.h"
19 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 18 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
20 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
21 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
22 #include "content/public/test/test_utils.h" 21 #include "content/public/test/test_utils.h"
23 #include "content/test/net/url_request_prepackaged_interceptor.h" 22 #include "content/test/net/url_request_prepackaged_interceptor.h"
23 #include "extensions/browser/extension_prefs.h"
24 #include "extensions/common/extension.h" 24 #include "extensions/common/extension.h"
25 #include "net/url_request/url_fetcher.h" 25 #include "net/url_request/url_fetcher.h"
26 26
27 using extensions::Extension; 27 using extensions::Extension;
28 28
29 class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { 29 class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest {
30 protected: 30 protected:
31 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 31 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
32 ExtensionBrowserTest::SetUpCommandLine(command_line); 32 ExtensionBrowserTest::SetUpCommandLine(command_line);
33 command_line->AppendSwitchASCII(switches::kAppsGalleryUpdateURL, 33 command_line->AppendSwitchASCII(switches::kAppsGalleryUpdateURL,
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 base::RunLoop().RunUntilIdle(); 218 base::RunLoop().RunUntilIdle();
219 219
220 extension = service_->GetExtensionById(extension_id, true); 220 extension = service_->GetExtensionById(extension_id, true);
221 ASSERT_TRUE(extension); 221 ASSERT_TRUE(extension);
222 EXPECT_EQ("2", extension->VersionString()); 222 EXPECT_EQ("2", extension->VersionString());
223 EXPECT_EQ(1u, service_->disabled_extensions()->size()); 223 EXPECT_EQ(1u, service_->disabled_extensions()->size());
224 EXPECT_EQ(Extension::DISABLE_PERMISSIONS_INCREASE, 224 EXPECT_EQ(Extension::DISABLE_PERMISSIONS_INCREASE,
225 service_->extension_prefs()->GetDisableReasons(extension_id)); 225 service_->extension_prefs()->GetDisableReasons(extension_id));
226 EXPECT_TRUE(GetExtensionDisabledGlobalError()); 226 EXPECT_TRUE(GetExtensionDisabledGlobalError());
227 } 227 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698