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

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

Issue 12212047: Linux/ChromeOS Chromium style checker cleanup, chrome/browser/extensions edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 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/file_path.h" 5 #include "base/file_path.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/extensions/extension_browsertest.h" 8 #include "chrome/browser/extensions/extension_browsertest.h"
9 #include "chrome/browser/extensions/extension_prefs.h" 9 #include "chrome/browser/extensions/extension_prefs.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/updater/extension_updater.h" 11 #include "chrome/browser/extensions/updater/extension_updater.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/global_error/global_error.h" 14 #include "chrome/browser/ui/global_error/global_error.h"
15 #include "chrome/browser/ui/global_error/global_error_service.h" 15 #include "chrome/browser/ui/global_error/global_error_service.h"
16 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 16 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/extensions/extension.h" 18 #include "chrome/common/extensions/extension.h"
19 #include "content/test/net/url_request_prepackaged_interceptor.h" 19 #include "content/test/net/url_request_prepackaged_interceptor.h"
20 #include "net/url_request/url_fetcher.h" 20 #include "net/url_request/url_fetcher.h"
21 21
22 using extensions::Extension; 22 using extensions::Extension;
23 23
24 class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { 24 class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest {
25 protected: 25 protected:
26 void SetUpCommandLine(CommandLine* command_line) { 26 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
27 ExtensionBrowserTest::SetUpCommandLine(command_line); 27 ExtensionBrowserTest::SetUpCommandLine(command_line);
28 command_line->AppendSwitchASCII(switches::kAppsGalleryUpdateURL, 28 command_line->AppendSwitchASCII(switches::kAppsGalleryUpdateURL,
29 "http://localhost/autoupdate/updates.xml"); 29 "http://localhost/autoupdate/updates.xml");
30 } 30 }
31 31
32 void SetUpOnMainThread() { 32 virtual void SetUpOnMainThread() OVERRIDE {
33 EXPECT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); 33 EXPECT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
34 service_ = browser()->profile()->GetExtensionService(); 34 service_ = browser()->profile()->GetExtensionService();
35 FilePath pem_path = test_data_dir_. 35 FilePath pem_path = test_data_dir_.
36 AppendASCII("permissions_increase").AppendASCII("permissions.pem"); 36 AppendASCII("permissions_increase").AppendASCII("permissions.pem");
37 path_v1_ = PackExtensionWithOptions( 37 path_v1_ = PackExtensionWithOptions(
38 test_data_dir_.AppendASCII("permissions_increase").AppendASCII("v1"), 38 test_data_dir_.AppendASCII("permissions_increase").AppendASCII("v1"),
39 scoped_temp_dir_.path().AppendASCII("permissions1.crx"), 39 scoped_temp_dir_.path().AppendASCII("permissions1.crx"),
40 pem_path, 40 pem_path,
41 FilePath()); 41 FilePath());
42 path_v2_ = PackExtensionWithOptions( 42 path_v2_ = PackExtensionWithOptions(
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 WaitForExtensionInstall(); 209 WaitForExtensionInstall();
210 210
211 extension = service_->GetExtensionById(extension_id, true); 211 extension = service_->GetExtensionById(extension_id, true);
212 ASSERT_TRUE(extension); 212 ASSERT_TRUE(extension);
213 EXPECT_EQ("2", extension->VersionString()); 213 EXPECT_EQ("2", extension->VersionString());
214 EXPECT_EQ(1u, service_->disabled_extensions()->size()); 214 EXPECT_EQ(1u, service_->disabled_extensions()->size());
215 EXPECT_EQ(Extension::DISABLE_PERMISSIONS_INCREASE, 215 EXPECT_EQ(Extension::DISABLE_PERMISSIONS_INCREASE,
216 service_->extension_prefs()->GetDisableReasons(extension_id)); 216 service_->extension_prefs()->GetDisableReasons(extension_id));
217 EXPECT_TRUE(GetExtensionDisabledGlobalError()); 217 EXPECT_TRUE(GetExtensionDisabledGlobalError());
218 } 218 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698