OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/test/remoting/remote_desktop_browsertest.h" | 5 #include "chrome/test/remoting/remote_desktop_browsertest.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 // Is there a better way to recognize the chromoting extension | 145 // Is there a better way to recognize the chromoting extension |
146 // than name comparison? | 146 // than name comparison? |
147 if (extension->name() == extension_name_) { | 147 if (extension->name() == extension_name_) { |
148 installed = true; | 148 installed = true; |
149 break; | 149 break; |
150 } | 150 } |
151 } | 151 } |
152 | 152 |
153 if (installed) { | 153 if (installed) { |
154 if (extension_) | 154 if (extension_) |
155 EXPECT_EQ(extension, extension_); | 155 EXPECT_EQ(extension.get(), extension_); |
156 else | 156 else |
157 extension_ = extension.get(); | 157 extension_ = extension.get(); |
158 | 158 |
159 // Either a V1 (TYPE_LEGACY_PACKAGED_APP) or a V2 (TYPE_PLATFORM_APP ) app. | 159 // Either a V1 (TYPE_LEGACY_PACKAGED_APP) or a V2 (TYPE_PLATFORM_APP ) app. |
160 extensions::Manifest::Type type = extension->GetType(); | 160 extensions::Manifest::Type type = extension->GetType(); |
161 EXPECT_TRUE(type == extensions::Manifest::TYPE_PLATFORM_APP || | 161 EXPECT_TRUE(type == extensions::Manifest::TYPE_PLATFORM_APP || |
162 type == extensions::Manifest::TYPE_LEGACY_PACKAGED_APP); | 162 type == extensions::Manifest::TYPE_LEGACY_PACKAGED_APP); |
163 | 163 |
164 EXPECT_TRUE(extension->ShouldDisplayInAppLauncher()); | 164 EXPECT_TRUE(extension->ShouldDisplayInAppLauncher()); |
165 } | 165 } |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
795 // static | 795 // static |
796 bool RemoteDesktopBrowserTest::IsHostActionComplete( | 796 bool RemoteDesktopBrowserTest::IsHostActionComplete( |
797 content::WebContents* client_web_content, | 797 content::WebContents* client_web_content, |
798 std::string host_action_var) { | 798 std::string host_action_var) { |
799 return ExecuteScriptAndExtractBool( | 799 return ExecuteScriptAndExtractBool( |
800 client_web_content, | 800 client_web_content, |
801 host_action_var); | 801 host_action_var); |
802 } | 802 } |
803 | 803 |
804 } // namespace remoting | 804 } // namespace remoting |
OLD | NEW |