| OLD | NEW |
| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 return result; | 80 return result; |
| 81 } | 81 } |
| 82 | 82 |
| 83 private: | 83 private: |
| 84 content::RenderFrameHost* GetIFrame() { | 84 content::RenderFrameHost* GetIFrame() { |
| 85 return content::FrameMatchingPredicate( | 85 return content::FrameMatchingPredicate( |
| 86 browser()->tab_strip_model()->GetActiveWebContents(), | 86 browser()->tab_strip_model()->GetActiveWebContents(), |
| 87 base::Bind(&content::FrameIsChildOfMainFrame)); | 87 base::Bind(&content::FrameIsChildOfMainFrame)); |
| 88 } | 88 } |
| 89 | 89 |
| 90 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 90 virtual void SetUpCommandLine(CommandLine* command_line) override { |
| 91 ExtensionBrowserTest::SetUpCommandLine(command_line); | 91 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 92 command_line->AppendSwitchASCII(switches::kAppsCheckoutURL, | 92 command_line->AppendSwitchASCII(switches::kAppsCheckoutURL, |
| 93 "http://checkout.com:"); | 93 "http://checkout.com:"); |
| 94 } | 94 } |
| 95 }; | 95 }; |
| 96 | 96 |
| 97 // Flaky http://crbug.com/238674 | 97 // Flaky http://crbug.com/238674 |
| 98 #if defined(OS_WIN) | 98 #if defined(OS_WIN) |
| 99 #define MAYBE_IsInstalled DISABLED_IsInstalled | 99 #define MAYBE_IsInstalled DISABLED_IsInstalled |
| 100 #else | 100 #else |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 GURL non_app_url(test_file_url.ReplaceComponents(replace_host)); | 332 GURL non_app_url(test_file_url.ReplaceComponents(replace_host)); |
| 333 | 333 |
| 334 // Check the install and running state of a non-app iframe running | 334 // Check the install and running state of a non-app iframe running |
| 335 // within an app. | 335 // within an app. |
| 336 ui_test_utils::NavigateToURL(browser(), app_url); | 336 ui_test_utils::NavigateToURL(browser(), app_url); |
| 337 | 337 |
| 338 EXPECT_EQ("not_installed", InstallStateInIFrame()); | 338 EXPECT_EQ("not_installed", InstallStateInIFrame()); |
| 339 EXPECT_EQ("cannot_run", RunningStateInIFrame()); | 339 EXPECT_EQ("cannot_run", RunningStateInIFrame()); |
| 340 EXPECT_FALSE(IsAppInstalledInIFrame()); | 340 EXPECT_FALSE(IsAppInstalledInIFrame()); |
| 341 } | 341 } |
| OLD | NEW |