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

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

Issue 2800873002: Update both end time and end reason when we don't have an end time. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/page_load_metrics/page_load_tracker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 return NULL; 131 return NULL;
132 } 132 }
133 133
134 private: 134 private:
135 void SetUpCommandLine(base::CommandLine* command_line) override { 135 void SetUpCommandLine(base::CommandLine* command_line) override {
136 ExtensionBrowserTest::SetUpCommandLine(command_line); 136 ExtensionBrowserTest::SetUpCommandLine(command_line);
137 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 137 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
138 } 138 }
139 }; 139 };
140 140
141 // flaky http://crbug.com/651844 141 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) {
142 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_CrossProcessClientRedirect) {
143 host_resolver()->AddRule("*", "127.0.0.1"); 142 host_resolver()->AddRule("*", "127.0.0.1");
144 ASSERT_TRUE(embedded_test_server()->Start()); 143 ASSERT_TRUE(embedded_test_server()->Start());
145 144
146 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); 145 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
147 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2"))); 146 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
148 147
149 GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/"); 148 GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
150 GURL::Replacements replace_host; 149 GURL::Replacements replace_host;
151 replace_host.SetHostStr("localhost"); 150 replace_host.SetHostStr("localhost");
152 base_url = base_url.ReplaceComponents(replace_host); 151 base_url = base_url.ReplaceComponents(replace_host);
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 browser(), base_url.Resolve("non_app/main.html")); 564 browser(), base_url.Resolve("non_app/main.html"));
566 ASSERT_TRUE(ExecuteScriptAndExtractString( 565 ASSERT_TRUE(ExecuteScriptAndExtractString(
567 browser()->tab_strip_model()->GetWebContentsAt(0), 566 browser()->tab_strip_model()->GetWebContentsAt(0),
568 kRetrieveSessionStorage.c_str(), &result)); 567 kRetrieveSessionStorage.c_str(), &result));
569 EXPECT_EQ("ss_normal", result); 568 EXPECT_EQ("ss_normal", result);
570 } 569 }
571 570
572 } // namespace 571 } // namespace
573 572
574 } // namespace extensions 573 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/page_load_metrics/page_load_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698