Reverting 40536 and 40535

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40537 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 35 deletions

diff --git a/chrome/browser/gtk/options/cookies_view_unittest.cc b/chrome/browser/gtk/options/cookies_view_unittest.cc
index b79903e..0c12dfd 100644
--- a/chrome/browser/gtk/options/cookies_view_unittest.cc
+++ b/chrome/browser/gtk/options/cookies_view_unittest.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/mock_browsing_data_appcache_helper.h"
 #include "chrome/browser/mock_browsing_data_database_helper.h"
 #include "chrome/browser/mock_browsing_data_local_storage_helper.h"
-#include "chrome/browser/gtk/cookie_display_gtk.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/test/testing_profile.h"
 #include "net/url_request/url_request_context.h"
@@ -45,59 +44,45 @@ class CookiesViewTest : public testing::Test {
                                const CookiesView& cookies_view) {
     // Cookies
     EXPECT_EQ(expected_cookies,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   cookie_name_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.cookie_name_entry_));
     EXPECT_EQ(expected_cookies,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   cookie_content_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.cookie_content_entry_));
     EXPECT_EQ(expected_cookies,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   cookie_domain_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.cookie_domain_entry_));
     EXPECT_EQ(expected_cookies,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   cookie_path_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.cookie_path_entry_));
     EXPECT_EQ(expected_cookies,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   cookie_send_for_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.cookie_send_for_entry_));
     EXPECT_EQ(expected_cookies,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   cookie_created_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.cookie_created_entry_));
     EXPECT_EQ(expected_cookies,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   cookie_expires_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.cookie_expires_entry_));
     // Database
     EXPECT_EQ(expected_database,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   database_description_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.database_description_entry_));
     EXPECT_EQ(expected_database,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   database_size_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.database_size_entry_));
     EXPECT_EQ(expected_database,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   database_last_modified_entry_));
+              GTK_WIDGET_SENSITIVE(
+                  cookies_view.database_last_modified_entry_));
     // Local Storage
     EXPECT_EQ(expected_local_storage,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   local_storage_origin_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.local_storage_origin_entry_));
     EXPECT_EQ(expected_local_storage,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   local_storage_size_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.local_storage_size_entry_));
     EXPECT_EQ(expected_local_storage,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   local_storage_last_modified_entry_));
+              GTK_WIDGET_SENSITIVE(
+                  cookies_view.local_storage_last_modified_entry_));
     // AppCache
     EXPECT_EQ(expected_appcache,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   appcache_manifest_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.appcache_manifest_entry_));
     EXPECT_EQ(expected_appcache,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   appcache_size_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.appcache_size_entry_));
     EXPECT_EQ(expected_appcache,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   appcache_created_entry_));
+              GTK_WIDGET_SENSITIVE(cookies_view.appcache_created_entry_));
     EXPECT_EQ(expected_appcache,
-              GTK_WIDGET_SENSITIVE(cookies_view.cookie_display_gtk_->
-                                   appcache_last_accessed_entry_));
+              GTK_WIDGET_SENSITIVE(
+                  cookies_view.appcache_last_accessed_entry_));
   }
 
   // Get the cookie names in the cookie list, as a comma seperated string.