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

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

Issue 10824198: Move small c/b/extensions classes into extensions namespace no.1 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master for cq Created 8 years, 4 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 "chrome/browser/extensions/extension_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 ExtensionBrowserTest::ExtensionBrowserTest() 44 ExtensionBrowserTest::ExtensionBrowserTest()
45 : loaded_(false), 45 : loaded_(false),
46 installed_(false), 46 installed_(false),
47 extension_installs_observed_(0), 47 extension_installs_observed_(0),
48 extension_load_errors_observed_(0), 48 extension_load_errors_observed_(0),
49 target_page_action_count_(-1), 49 target_page_action_count_(-1),
50 target_visible_page_action_count_(-1), 50 target_visible_page_action_count_(-1),
51 current_channel_(chrome::VersionInfo::CHANNEL_DEV) { 51 current_channel_(chrome::VersionInfo::CHANNEL_DEV) {
52 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); 52 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
53 AppShortcutManager::SetShortcutCreationDisabledForTesting(true); 53 extensions::AppShortcutManager::SetShortcutCreationDisabledForTesting(true);
54 } 54 }
55 55
56 ExtensionBrowserTest::~ExtensionBrowserTest() { 56 ExtensionBrowserTest::~ExtensionBrowserTest() {
57 AppShortcutManager::SetShortcutCreationDisabledForTesting(false); 57 extensions::AppShortcutManager::SetShortcutCreationDisabledForTesting(false);
58 } 58 }
59 59
60 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { 60 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
61 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); 61 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
62 test_data_dir_ = test_data_dir_.AppendASCII("extensions"); 62 test_data_dir_ = test_data_dir_.AppendASCII("extensions");
63 63
64 #if defined(OS_CHROMEOS) 64 #if defined(OS_CHROMEOS)
65 // This makes sure that we create the Default profile first, with no 65 // This makes sure that we create the Default profile first, with no
66 // ExtensionService and then the real profile with one, as we do when 66 // ExtensionService and then the real profile with one, as we do when
67 // running on chromeos. 67 // running on chromeos.
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 case content::NOTIFICATION_LOAD_STOP: 673 case content::NOTIFICATION_LOAD_STOP:
674 VLOG(1) << "Got LOAD_STOP notification."; 674 VLOG(1) << "Got LOAD_STOP notification.";
675 MessageLoopForUI::current()->Quit(); 675 MessageLoopForUI::current()->Quit();
676 break; 676 break;
677 677
678 default: 678 default:
679 NOTREACHED(); 679 NOTREACHED();
680 break; 680 break;
681 } 681 }
682 } 682 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_activity_log.cc ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698