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

Side by Side Diff: chrome/browser/extensions/isolated_app_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/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_commands.h" 9 #include "chrome/browser/ui/browser_commands.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 iter != extension_ids.end(); ++iter) { 118 iter != extension_ids.end(); ++iter) {
119 const Extension* installed_app = 119 const Extension* installed_app =
120 registry->enabled_extensions().GetByID(*iter); 120 registry->enabled_extensions().GetByID(*iter);
121 if (installed_app && installed_app->is_app()) 121 if (installed_app && installed_app->is_app())
122 return installed_app; 122 return installed_app;
123 } 123 }
124 return NULL; 124 return NULL;
125 } 125 }
126 126
127 private: 127 private:
128 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { 128 virtual void SetUpCommandLine(base::CommandLine* command_line) override {
129 ExtensionBrowserTest::SetUpCommandLine(command_line); 129 ExtensionBrowserTest::SetUpCommandLine(command_line);
130 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 130 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
131 } 131 }
132 }; 132 };
133 133
134 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { 134 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) {
135 host_resolver()->AddRule("*", "127.0.0.1"); 135 host_resolver()->AddRule("*", "127.0.0.1");
136 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 136 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
137 137
138 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); 138 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 585 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
586 ASSERT_TRUE(ExecuteScriptAndExtractString( 586 ASSERT_TRUE(ExecuteScriptAndExtractString(
587 browser()->tab_strip_model()->GetWebContentsAt(0), 587 browser()->tab_strip_model()->GetWebContentsAt(0),
588 kRetrieveSessionStorage.c_str(), &result)); 588 kRetrieveSessionStorage.c_str(), &result));
589 EXPECT_EQ("ss_normal", result); 589 EXPECT_EQ("ss_normal", result);
590 } 590 }
591 591
592 } // namespace 592 } // namespace
593 593
594 } // namespace extensions 594 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/install_verifier.h ('k') | chrome/browser/extensions/lazy_background_page_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698