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

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

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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/threading/sequenced_worker_pool.h" 7 #include "base/threading/sequenced_worker_pool.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 16 matching lines...) Expand all
27 #include "sync/protocol/extension_specifics.pb.h" 27 #include "sync/protocol/extension_specifics.pb.h"
28 #include "sync/protocol/sync.pb.h" 28 #include "sync/protocol/sync.pb.h"
29 29
30 using content::BrowserThread; 30 using content::BrowserThread;
31 using extensions::Extension; 31 using extensions::Extension;
32 using extensions::ExtensionRegistry; 32 using extensions::ExtensionRegistry;
33 using extensions::ExtensionPrefs; 33 using extensions::ExtensionPrefs;
34 34
35 class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { 35 class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest {
36 protected: 36 protected:
37 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 37 virtual void SetUpCommandLine(CommandLine* command_line) override {
38 ExtensionBrowserTest::SetUpCommandLine(command_line); 38 ExtensionBrowserTest::SetUpCommandLine(command_line);
39 command_line->AppendSwitchASCII(switches::kAppsGalleryUpdateURL, 39 command_line->AppendSwitchASCII(switches::kAppsGalleryUpdateURL,
40 "http://localhost/autoupdate/updates.xml"); 40 "http://localhost/autoupdate/updates.xml");
41 } 41 }
42 42
43 virtual void SetUpOnMainThread() OVERRIDE { 43 virtual void SetUpOnMainThread() override {
44 EXPECT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); 44 EXPECT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
45 service_ = extensions::ExtensionSystem::Get( 45 service_ = extensions::ExtensionSystem::Get(
46 browser()->profile())->extension_service(); 46 browser()->profile())->extension_service();
47 registry_ = ExtensionRegistry::Get(browser()->profile()); 47 registry_ = ExtensionRegistry::Get(browser()->profile());
48 const base::FilePath test_dir = 48 const base::FilePath test_dir =
49 test_data_dir_.AppendASCII("permissions_increase"); 49 test_data_dir_.AppendASCII("permissions_increase");
50 const base::FilePath pem_path = test_dir.AppendASCII("permissions.pem"); 50 const base::FilePath pem_path = test_dir.AppendASCII("permissions.pem");
51 path_v1_ = PackExtensionWithOptions( 51 path_v1_ = PackExtensionWithOptions(
52 test_dir.AppendASCII("v1"), 52 test_dir.AppendASCII("v1"),
53 scoped_temp_dir_.path().AppendASCII("permissions1.crx"), 53 scoped_temp_dir_.path().AppendASCII("permissions1.crx"),
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 286
287 const Extension* extension = service_->GetExtensionById(extension_id, true); 287 const Extension* extension = service_->GetExtensionById(extension_id, true);
288 ASSERT_TRUE(extension); 288 ASSERT_TRUE(extension);
289 EXPECT_EQ("2", extension->VersionString()); 289 EXPECT_EQ("2", extension->VersionString());
290 EXPECT_EQ(1u, registry_->disabled_extensions().size()); 290 EXPECT_EQ(1u, registry_->disabled_extensions().size());
291 EXPECT_EQ(Extension::DISABLE_REMOTE_INSTALL, 291 EXPECT_EQ(Extension::DISABLE_REMOTE_INSTALL,
292 ExtensionPrefs::Get(service_->profile()) 292 ExtensionPrefs::Get(service_->profile())
293 ->GetDisableReasons(extension_id)); 293 ->GetDisableReasons(extension_id));
294 EXPECT_TRUE(GetExtensionDisabledGlobalError()); 294 EXPECT_TRUE(GetExtensionDisabledGlobalError());
295 } 295 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_disabled_ui.cc ('k') | chrome/browser/extensions/extension_error_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698