Cleaning up CRWBrowsingDataMode

ios/web/crw_browsing_data_store_unittest.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/public/crw_browsing_data_store.h"
 
 #include "base/ios/ios_util.h"
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 140 matching lines @@
   }
 
   MakeInactive();
   base::scoped_nsobject<CRWTestBrowsingDataStoreObserver> observer(
       [[CRWTestBrowsingDataStoreObserver alloc]
           initWithBrowsingDataStore:browsing_data_store_]);
   EXPECT_EQ(0U, [observer modeChangeCount]);
 
   id unsucessfullCallback = ^(BOOL success) {
     ASSERT_TRUE([NSThread isMainThread]);
-    CRWBrowsingDataStoreMode mode = [browsing_data_store_ mode];
+    web::BrowsingDataStoreMode mode = [browsing_data_store_ mode];

[Eugene But (OOO till 7-30), 2015/06/04 15:42:59]

Drop web:: this code is already in web namespace.

[shreyasv1, 2015/06/05 21:05:51]

Done.

     EXPECT_FALSE(success);
-    EXPECT_EQ(SYNCHRONIZING, mode);
+    EXPECT_EQ(CHANGING, mode);
   };
   [browsing_data_store_ makeActiveWithCompletionHandler:unsucessfullCallback];
-  EXPECT_EQ(SYNCHRONIZING, [browsing_data_store_ mode]);
+  EXPECT_EQ(CHANGING, [browsing_data_store_ mode]);
   EXPECT_EQ(1U, [observer modeChangeCount]);
 
   [browsing_data_store_ makeInactiveWithCompletionHandler:unsucessfullCallback];
-  EXPECT_EQ(SYNCHRONIZING, [browsing_data_store_ mode]);
+  EXPECT_EQ(CHANGING, [browsing_data_store_ mode]);
 
   [browsing_data_store_ makeActiveWithCompletionHandler:unsucessfullCallback];
-  EXPECT_EQ(SYNCHRONIZING, [browsing_data_store_ mode]);
+  EXPECT_EQ(CHANGING, [browsing_data_store_ mode]);
 
   __block BOOL block_was_called = NO;
   [browsing_data_store_ makeInactiveWithCompletionHandler:^(BOOL success) {
     ASSERT_TRUE([NSThread isMainThread]);
-    CRWBrowsingDataStoreMode mode = [browsing_data_store_ mode];
+    web::BrowsingDataStoreMode mode = [browsing_data_store_ mode];

[Eugene But (OOO till 7-30), 2015/06/04 15:42:58]

ditto

[shreyasv1, 2015/06/05 21:05:51]

Done.

     EXPECT_TRUE(success);
     EXPECT_EQ(INACTIVE, mode);
     block_was_called = YES;
   }];
-  EXPECT_EQ(SYNCHRONIZING, [browsing_data_store_ mode]);
+  EXPECT_EQ(CHANGING, [browsing_data_store_ mode]);
 
   base::test::ios::WaitUntilCondition(^bool{
     return block_was_called;
   });
 
   EXPECT_EQ(INACTIVE, [browsing_data_store_ mode]);
   EXPECT_EQ(2U, [observer modeChangeCount]);
 }
 
 // Tests that CRWBrowsingDataStore correctly handles |removeDataOfTypes:|.
@@ skipping 37 matching lines @@
 
   ASSERT_EQ(ACTIVE, [browsing_data_store_ mode]);
 
   [browsing_data_store_ makeInactiveWithCompletionHandler:nil];
   // |removeDataOfTypes| is called immediately after a |makeInactive| call.
   RemoveDataOfTypes(BROWSING_DATA_TYPE_COOKIES);
   EXPECT_EQ(INACTIVE, [browsing_data_store_ mode]);
 }
 
 }  // namespace web