OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 } | 83 } |
84 } | 84 } |
85 if (!extension) | 85 if (!extension) |
86 return NULL; | 86 return NULL; |
87 | 87 |
88 const std::string extension_id = extension->id(); | 88 const std::string extension_id = extension->id(); |
89 | 89 |
90 // The call to OnExtensionInstalled ensures the other extension prefs | 90 // The call to OnExtensionInstalled ensures the other extension prefs |
91 // are set up with the defaults. | 91 // are set up with the defaults. |
92 service->extension_prefs()->OnExtensionInstalled( | 92 service->extension_prefs()->OnExtensionInstalled( |
93 extension, Extension::ENABLED, false); | 93 extension, Extension::ENABLED, false, 0); |
94 | 94 |
95 // Toggling incognito or file access will reload the extension, so wait for | 95 // Toggling incognito or file access will reload the extension, so wait for |
96 // the reload and grab the new extension instance. The default state is | 96 // the reload and grab the new extension instance. The default state is |
97 // incognito disabled and file access enabled, so we don't wait in those | 97 // incognito disabled and file access enabled, so we don't wait in those |
98 // cases. | 98 // cases. |
99 { | 99 { |
100 ui_test_utils::WindowedNotificationObserver load_signal( | 100 ui_test_utils::WindowedNotificationObserver load_signal( |
101 chrome::NOTIFICATION_EXTENSION_LOADED, | 101 chrome::NOTIFICATION_EXTENSION_LOADED, |
102 Source<Profile>(browser()->profile())); | 102 Source<Profile>(browser()->profile())); |
103 CHECK(!service->IsIncognitoEnabled(extension_id)); | 103 CHECK(!service->IsIncognitoEnabled(extension_id)); |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 MessageLoopForUI::current()->Quit(); | 474 MessageLoopForUI::current()->Quit(); |
475 } | 475 } |
476 break; | 476 break; |
477 } | 477 } |
478 | 478 |
479 default: | 479 default: |
480 NOTREACHED(); | 480 NOTREACHED(); |
481 break; | 481 break; |
482 } | 482 } |
483 } | 483 } |
OLD | NEW |