| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 } | 85 } |
| 86 } | 86 } |
| 87 if (!extension) | 87 if (!extension) |
| 88 return NULL; | 88 return NULL; |
| 89 | 89 |
| 90 const std::string extension_id = extension->id(); | 90 const std::string extension_id = extension->id(); |
| 91 | 91 |
| 92 // The call to OnExtensionInstalled ensures the other extension prefs | 92 // The call to OnExtensionInstalled ensures the other extension prefs |
| 93 // are set up with the defaults. | 93 // are set up with the defaults. |
| 94 service->extension_prefs()->OnExtensionInstalled( | 94 service->extension_prefs()->OnExtensionInstalled( |
| 95 extension, Extension::ENABLED, false, | 95 extension, Extension::ENABLED, false, 0); |
| 96 StringOrdinal::CreateInitialOrdinal()); | |
| 97 | 96 |
| 98 // Toggling incognito or file access will reload the extension, so wait for | 97 // Toggling incognito or file access will reload the extension, so wait for |
| 99 // the reload and grab the new extension instance. The default state is | 98 // the reload and grab the new extension instance. The default state is |
| 100 // incognito disabled and file access enabled, so we don't wait in those | 99 // incognito disabled and file access enabled, so we don't wait in those |
| 101 // cases. | 100 // cases. |
| 102 { | 101 { |
| 103 ui_test_utils::WindowedNotificationObserver load_signal( | 102 ui_test_utils::WindowedNotificationObserver load_signal( |
| 104 chrome::NOTIFICATION_EXTENSION_LOADED, | 103 chrome::NOTIFICATION_EXTENSION_LOADED, |
| 105 content::Source<Profile>(browser()->profile())); | 104 content::Source<Profile>(browser()->profile())); |
| 106 CHECK(!service->IsIncognitoEnabled(extension_id)); | 105 CHECK(!service->IsIncognitoEnabled(extension_id)); |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 MessageLoopForUI::current()->Quit(); | 498 MessageLoopForUI::current()->Quit(); |
| 500 } | 499 } |
| 501 break; | 500 break; |
| 502 } | 501 } |
| 503 | 502 |
| 504 default: | 503 default: |
| 505 NOTREACHED(); | 504 NOTREACHED(); |
| 506 break; | 505 break; |
| 507 } | 506 } |
| 508 } | 507 } |
| OLD | NEW |