diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/tabs/tab_strip_model_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/common/extensions/extension.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 981293d..0d53e43 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -1715,11 +1715,11 @@ TEST_F(TabStripModelTest, Apps) { DictionaryValue manifest; manifest.SetString("name", "hi!"); manifest.SetString("version", "1"); + manifest.SetString("app.launch.web_url", "http://www.google.com"); std::string error; scoped_refptr<Extension> extension_app( Extension::Create(path, extensions::Manifest::INVALID_LOCATION, manifest, Extension::NO_FLAGS, &error)); - extension_app->launch_web_url_ = "http://www.google.com"; WebContents* contents1 = CreateWebContents(); extensions::TabHelper::CreateForWebContents(contents1); extensions::TabHelper::FromWebContents(contents1)-> diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index ebe669c3..bad417c 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -14,7 +14,6 @@ #include <vector> #include "base/files/file_path.h" -#include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" @@ -48,8 +47,6 @@ namespace gfx { class ImageSkia; } -FORWARD_DECLARE_TEST(TabStripModelTest, Apps); - namespace extensions { struct ActionInfo; class APIPermissionSet; @@ -894,8 +891,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> { // The flags that were passed to InitFromValue. int creation_flags_; - FRIEND_TEST_ALL_PREFIXES(::TabStripModelTest, Apps); - DISALLOW_COPY_AND_ASSIGN(Extension); }; |